Attachment 149572 Details for Bug 195158 – patch for astro/geographiclib

[patch] patch for astro/geographiclib

patch-GeographicLib.diff (text/plain), 7.51 KB, created by Tatsuki Makino on 2014-11-19 03:11:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2014-11-19 03:11:25 UTC

Size: 7.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 372758)
>+++ Makefile	(working copy)
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	geographiclib
>-PORTVERSION=	1.38
>+PORTVERSION=	1.39
> CATEGORIES=	astro
>-MASTER_SITES=	SF/geographiclib/distrib \
>+MASTER_SITES=	SF/geographiclib/distrib\
> 		SF/geographiclib:geoids,gravity,magnetic
> DISTNAME=	GeographicLib-${PORTVERSION}
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -27,12 +27,20 @@
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFAULT=	GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84 \
>+OPTIONS_DEFINE=	DOXYGEN PERL
>+OPTIONS_DEFAULT=	DOXYGEN PERL\
>+			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
> 			MAGNETIC_WMM2010 MAGNETIC_IGRF11
>+PERL_DESC=	Build documentation with pod2man and pod2html
> OPTIONS_GROUP=	DATASETS
> OPTIONS_SUB=	yes
>+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
>+DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
>+PERL_USE=	PERL5=build
>+PERL_USES=	perl5
>+PERL_CONFIGURE_ENV_OFF=	ac_cv_prog_POD2MAN= ac_cv_prog_POD2HTML=
> 
>-GEOID_NAMES:=		egm84-30 egm84-15 egm96-15 egm96-5 \
>+GEOID_NAMES:=		egm84-30 egm84-15 egm96-15 egm96-5\
> 			egm2008-5 egm2008-2_5 egm2008-1
> GRAVITY_NAMES:=		egm84 egm96 egm2008 wgs84 grs80
> MAGNETIC_NAMES:=	wmm2010 igrf11 emm2010
>@@ -67,13 +75,13 @@
> .include <bsd.port.options.mk>
> 
> post-patch:
>-	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /' \
>+	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
> 		${WRKSRC}/tools/geographiclib-get-*.sh
> 
> .for n in geoids gravity magnetic
> install-datasets-${n}: .NOTMAIN
> 	${MKDIR} ${STAGEDIR}${DATADIR}/${n}
>-	(cd ${WRKDIR}/${n} && \
>+	(cd ${WRKDIR}/${n} &&\
> 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${n})
> .PHONY: install-datasets-${n}
> .endfor
>@@ -91,7 +99,7 @@
> .PHONY: x-tool-plist
> x-tool-plist: ${PLIST} .NOTMAIN
> 	${REINPLACE_CMD}\
>-		-e '/^%%PORTDOCS%%/d' -e '/@dir /d'\
>+		-e '/^%%PORTDOCS%%/d'\
> 		-e '/^%%DATADIR%%\/geoids\/[^.]/{\
> 		h;s|^%%DATADIR%%/geoids/$[^.]\{1,\}$.*|GEOID_\1|;\
> 		s/[^0-9A-Za-z]/_/g;\
>Index: distinfo
>===================================================================
>--- distinfo	(revision 372758)
>+++ distinfo	(working copy)
>@@ -1,32 +1,32 @@
>-SHA256 (GeographicLib/GeographicLib-1.38.tar.gz) = 13904610395efb0b2a94729a912688aca87b02cf7518633178c6a4a829aeff8c
>-SIZE (GeographicLib/GeographicLib-1.38.tar.gz) = 1976874
>-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
>-SIZE (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = 34927299
>-SHA256 (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 9a57c14330ac609132d324906822a9da9de265ad9b9087779793eb7080852970
>-SIZE (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 10414793
>+SHA256 (GeographicLib/GeographicLib-1.39.tar.gz) = d4d69dad1009a7df04c1895fd3b176c8bfe404398112c075e009418d98ba3bfb
>+SIZE (GeographicLib/GeographicLib-1.39.tar.gz) = 2025899
>+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
> SIZE (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 1475184
>-SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
>-SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
> SHA256 (GeographicLib/geoids-distrib/egm96-15.tar.bz2) = 8b1ebad1ebae0a045502d0edb9cc51553da1d3914f01e07470c11b3bed75048e
> SIZE (GeographicLib/geoids-distrib/egm96-15.tar.bz2) = 1490277
> SHA256 (GeographicLib/geoids-distrib/egm96-5.tar.bz2) = c46224f8f723dc915d97179f4e1580a98d6c742fe2b82cd8fef0ecaaad13e614
> SIZE (GeographicLib/geoids-distrib/egm96-5.tar.bz2) = 10225152
>-SHA256 (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 54c1f511892a3d6a1362fb91a8f65efb4bd56e1cf4ff205344e003bd5074ed91
>-SIZE (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 74456990
>+SHA256 (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 9a57c14330ac609132d324906822a9da9de265ad9b9087779793eb7080852970
>+SIZE (GeographicLib/geoids-distrib/egm2008-5.tar.bz2) = 10414793
>+SHA256 (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = d602e13446a4a4a23f39aecfe6a2a0760a1bc6c1b497482c2ebc9f7d513be699
>+SIZE (GeographicLib/geoids-distrib/egm2008-2_5.tar.bz2) = 34927299
>+SHA256 (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = bdb382d0be7ece9142450eacc24b7b7f0889ee3e0ba4f535b04ec383f94c0fb5
>+SIZE (GeographicLib/geoids-distrib/egm2008-1.tar.bz2) = 162388303
> SHA256 (GeographicLib/gravity-distrib/egm84.tar.bz2) = 7ebec3b2aa2e88581470cd776299942c2300d797316b431c7a7da4ac2c31d80e
> SIZE (GeographicLib/gravity-distrib/egm84.tar.bz2) = 258023
> SHA256 (GeographicLib/gravity-distrib/egm96.tar.bz2) = 6fea4c6bd56ff8ac53dbdad8d5dd505c855471d0354c4abc5c5fe048bf8350c1
> SIZE (GeographicLib/gravity-distrib/egm96.tar.bz2) = 2055724
>+SHA256 (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 54c1f511892a3d6a1362fb91a8f65efb4bd56e1cf4ff205344e003bd5074ed91
>+SIZE (GeographicLib/gravity-distrib/egm2008.tar.bz2) = 74456990
>+SHA256 (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 4cf4f7e533261986b25f9e3c929d846044e0fb2b9c35f301df545c335491f2e7
>+SIZE (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 807
> SHA256 (GeographicLib/gravity-distrib/grs80.tar.bz2) = 636c438460c9ccb90332bd6fd7d57dbfa62782ac6b64bd84989d559736579230
> SIZE (GeographicLib/gravity-distrib/grs80.tar.bz2) = 784
>-SHA256 (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 4cf4f7e533261986b25f9e3c929d846044e0fb2b9c35f301df545c335491f2e7
>-SIZE (GeographicLib/gravity-distrib/wgs84.tar.bz2) = 807
>+SHA256 (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = a40aced2d5d36b3183f3efc759820d16a7daab81a33a0b81db0510e8d17dbb5e
>+SIZE (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = 1442
>+SHA256 (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 1289557fe660052c8fb42eb62d3307e8efd95a4d05031a1befd92f1f433f6457
>+SIZE (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 6011
> SHA256 (GeographicLib/magnetic-distrib/emm2010.tar.bz2) = aa8782fddb505d8dc24e3dd26784712c1b1848227e23cdcb4e4f2d3ed49d9e14
> SIZE (GeographicLib/magnetic-distrib/emm2010.tar.bz2) = 3627692
>-SHA256 (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 1289557fe660052c8fb42eb62d3307e8efd95a4d05031a1befd92f1f433f6457
>-SIZE (GeographicLib/magnetic-distrib/igrf11.tar.bz2) = 6011
>-SHA256 (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = a40aced2d5d36b3183f3efc759820d16a7daab81a33a0b81db0510e8d17dbb5e
>-SIZE (GeographicLib/magnetic-distrib/wmm2010.tar.bz2) = 1442
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 372758)
>+++ pkg-plist	(working copy)
>@@ -51,8 +51,8 @@
> include/GeographicLib/Utility.hpp
> lib/libGeographic.a
> lib/libGeographic.so
>-lib/libGeographic.so.13
>-lib/libGeographic.so.13.0.1
>+lib/libGeographic.so.14
>+lib/libGeographic.so.14.0.0
> %%PYTHON_SITELIBDIR%%/geographiclib/__init__.py
> %%PYTHON_SITELIBDIR%%/geographiclib/accumulator.py
> %%PYTHON_SITELIBDIR%%/geographiclib/constants.py
>@@ -116,6 +116,7 @@
> libexec/GeographicLib/matlab/private/C3f.m
> libexec/GeographicLib/matlab/private/C4coeff.m
> libexec/GeographicLib/matlab/private/C4f.m
>+libexec/GeographicLib/matlab/private/G4coeff.m
> libexec/GeographicLib/matlab/private/SinCosNorm.m
> libexec/GeographicLib/matlab/private/SinCosSeries.m
> libexec/GeographicLib/matlab/private/atanhee.m

Actions: View | Diff

Attachments on bug 195158: 149572 | 149573