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

[patch] patch for astro/geographiclib

patch-GeographicLib.diff (text/plain), 6.04 KB, created by Tatsuki Makino on 2017-03-27 07:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2017-03-27 07:02:14 UTC

Size: 6.04 KB

patch

obsolete

>Index: astro/geographiclib/Makefile
>===================================================================
>--- astro/geographiclib/Makefile	(revision 412344)
>+++ astro/geographiclib/Makefile	(working copy)
>@@ -2,11 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	geographiclib
>-PORTVERSION=	1.46
>+PORTVERSION=	1.47
>+DISTVERSIONSUFFIX=	-patch1
> 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
> 
>@@ -16,24 +17,31 @@
> 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=	-DINSTALL_PYTHON_DIR:STRING=${PYTHON_SITELIBDIR:Q}\
>+		-DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q}
>+CMAKE_VARS_OFF=	GNU_CONFIGURE=yes
>+CMAKE_BUILD_DEPENDS_OFF=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
>+CMAKE_INSTALL_TARGET_OFF=	install-strip
>+CMAKE_MAKE_ARGS_OFF=	pythondir=${PYTHON_SITELIBDIR:Q}/geographiclib\
>+		cmakedir=\$$$datadir$/cmake/Modules
>+CMAKE_USES=	cmake
>+CMAKE_USES_OFF=	autoreconf gmake libtool pkgconfig
> DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
> DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
> PERL_USE=	PERL5=build
>@@ -73,6 +81,22 @@
> 	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
> 		${WRKSRC}/tools/geographiclib-get-*.sh
> 
>+post-patch-CMAKE-on:
>+	${REINPLACE_CMD} -E\
>+		-e '/DESTINATION.*\/pkgconfig/s,lib,libdata,'\
>+		${WRKSRC}/cmake/CMakeLists.txt
>+	${REINPLACE_CMD} -E\
>+		-e '/set \(INSTALL_DOC_DIR/d'\
>+		-e '/DOXYGEN_FOUND/{x;s,^.*$$,find_package(Doxygen),;G;}'\
>+		${WRKSRC}/doc/CMakeLists.txt
>+	${REINPLACE_CMD} -E\
>+		-e 's,(DESTINATION.*)share/,\1,'\
>+		-e '/DOXYGEN_FOUND/{x;s,^.*$$,find_package(Doxygen),;G;}'\
>+		${WRKSRC}/man/CMakeLists.txt
>+	${REINPLACE_CMD} -E\
>+		-e '/set \(INSTALL_PYTHON_DIR/d'\
>+		${WRKSRC}/python/geographiclib/CMakeLists.txt
>+
> .for n in ${GEOID_NAMES}
> post-install-GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-geoids
> .endfor
>@@ -110,6 +134,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 412344)
>+++ 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 = 1490313600
>+SHA256 (GeographicLib/GeographicLib-1.47-patch1.tar.gz) = 6a781d03644904a0ea794938e10b2b417fc6e260cf922d3f79277a772ff0a983
>+SIZE (GeographicLib/GeographicLib-1.47-patch1.tar.gz) = 2238894
> 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/pkg-plist
>===================================================================
>--- astro/geographiclib/pkg-plist	(revision 412344)
>+++ 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.0
> 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