Attachment 147716 Details for Bug 193968 – patch for astro/geographiclib

[patch] patch for astro/geographiclib

patch-GeographicLib.diff (text/plain), 5.10 KB, created by Tatsuki Makino on 2014-09-27 10:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tatsuki Makino

Created: 2014-09-27 10:05:57 UTC

Size: 5.10 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 369382)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	geographiclib
> PORTVERSION=	1.37
>+PORTREVISION=	1
> CATEGORIES=	astro
> MASTER_SITES=	SF/geographiclib/distrib \
> 		SF/geographiclib:geoids,gravity,magnetic
>@@ -18,13 +19,14 @@
> USES=		gmake libtool python
> USE_GCC=	any
> USE_AUTOTOOLS=	autoconf
>+WRKSRC=		${WRKDIR}/${DISTNAME}
>+NO_WRKSUBDIR=	yes
>+PORTDOCS=	*
> GNU_CONFIGURE=	yes
>+MAKE_ARGS+=	geographiclib_data=${DATADIR:Q}
>+MAKE_ARGS+=	pythondir=${PYTHON_SITELIBDIR}/geographiclib
>+INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	yes
>-NO_WRKSUBDIR=	yes
>-INSTALL_TARGET=	install-strip
>-WRKSRC=		${WRKDIR}/${DISTNAME}
>-MAKE_ARGS=	pythondir=${PYTHON_SITELIBDIR}/geographiclib
>-PORTDOCS=	*
> 
> OPTIONS_SUB=	yes
> OPTIONS_DEFAULT=	GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84 \
>@@ -68,24 +70,50 @@
> 	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /' \
> 		${WRKSRC}/tools/geographiclib-get-*.sh
> 
>-post-install:
>-	${MKDIR} ${STAGEDIR}${DATADIR}/geoids \
>-		${STAGEDIR}${DATADIR}/gravity \
>-		${STAGEDIR}${DATADIR}/magnetic
>-	${TOUCH} ${STAGEDIR}${DATADIR}/geoids/.keep \
>-		${STAGEDIR}${DATADIR}/gravity/.keep \
>-		${STAGEDIR}${DATADIR}/magnetic/.keep
>+install-datasets-mkdir: .NOTMAIN
>+	for d in geoids gravity magnetic ;\
>+	do ${MKDIR} ${STAGEDIR}${DATADIR}/$${d} &&\
>+		${TOUCH} ${STAGEDIR}${DATADIR}/$${d}/.keep ;\
>+	done
>+.PHONY: install-datasets-mkdir
>+
>+.for n in geoids gravity magnetic
>+install-datasets-${n}: install-datasets-mkdir .NOTMAIN
>+	(cd ${WRKDIR}/${n} && \
>+		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${n})
>+.PHONY: install-datasets-${n}
>+.endfor
>+
>+post-install: install-datasets-mkdir
> .if ${PORT_OPTIONS:MGEOID_*}
>-	(cd ${WRKDIR}/geoids && \
>-		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/geoids)
>+post-install: install-datasets-geoids
> .endif
> .if ${PORT_OPTIONS:MGRAVITY_*}
>-	(cd ${WRKDIR}/gravity && \
>-		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/gravity)
>+post-install: install-datasets-gravity
> .endif
> .if ${PORT_OPTIONS:MMAGNETIC_*}
>-	(cd ${WRKDIR}/magnetic && \
>-		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/magnetic)
>+post-install: install-datasets-magnetic
> .endif
> 
>+.PHONY: x-tool-plist
>+x-tool-plist: ${PLIST} .NOTMAIN
>+	${REINPLACE_CMD}\
>+		-e '/^%%PORTDOCS%%/d'\
>+		-e '/^%%DATADIR%%\/geoids\/[^.]/{\
>+		h;s|^%%DATADIR%%/geoids/$[^.]\{1,\}$.*|GEOID_\1|;\
>+		s/[^0-9A-Za-z]/_/g;\
>+		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
>+		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
>+		-e '/^%%DATADIR%%\/gravity\/[^.]/{\
>+		h;s|^%%DATADIR%%/gravity/$[^.]\{1,\}$.*|GRAVITY_\1|;\
>+		s/[^0-9A-Za-z]/_/g;\
>+		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
>+		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
>+		-e '/^%%DATADIR%%\/magnetic\/[^.]/{\
>+		h;s|^%%DATADIR%%/magnetic/$[^.]\{1,\}$.*|MAGNETIC_\1|;\
>+		s/[^0-9A-Za-z]/_/g;\
>+		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
>+		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
>+		${PLIST}
>+
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 369382)
>+++ pkg-plist	(working copy)
>@@ -142,9 +142,8 @@
> sbin/geographiclib-get-geoids
> sbin/geographiclib-get-gravity
> sbin/geographiclib-get-magnetic
>+share/cmake/GeographicLib/FindGeographicLib.cmake
> %%DATADIR%%/geoids/.keep
>-%%DATADIR%%/gravity/.keep
>-%%DATADIR%%/magnetic/.keep
> %%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
>@@ -166,6 +165,7 @@
> %%GEOID_EGM96_5%%%%DATADIR%%/geoids/egm96-5.pgm
> %%GEOID_EGM96_5%%%%DATADIR%%/geoids/egm96-5.pgm.aux.xml
> %%GEOID_EGM96_5%%%%DATADIR%%/geoids/egm96-5.wld
>+%%DATADIR%%/gravity/.keep
> %%GRAVITY_EGM2008%%%%DATADIR%%/gravity/egm2008.egm
> %%GRAVITY_EGM2008%%%%DATADIR%%/gravity/egm2008.egm.cof
> %%GRAVITY_EGM84%%%%DATADIR%%/gravity/egm84.egm
>@@ -174,6 +174,7 @@
> %%GRAVITY_EGM96%%%%DATADIR%%/gravity/egm96.egm.cof
> %%GRAVITY_WGS84%%%%DATADIR%%/gravity/wgs84.egm
> %%GRAVITY_WGS84%%%%DATADIR%%/gravity/wgs84.egm.cof
>+%%DATADIR%%/magnetic/.keep
> %%MAGNETIC_EMM2010%%%%DATADIR%%/magnetic/emm2010.wmm
> %%MAGNETIC_EMM2010%%%%DATADIR%%/magnetic/emm2010.wmm.cof
> %%MAGNETIC_IGRF11%%%%DATADIR%%/magnetic/igrf11.wmm
>@@ -180,15 +181,14 @@
> %%MAGNETIC_IGRF11%%%%DATADIR%%/magnetic/igrf11.wmm.cof
> %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm
> %%MAGNETIC_WMM2010%%%%DATADIR%%/magnetic/wmm2010.wmm.cof
>-share/cmake/GeographicLib/FindGeographicLib.cmake
>-@dirrm include/GeographicLib
>-@dirrm %%PYTHON_SITELIBDIR%%/geographiclib
>-@dirrm libexec/GeographicLib/matlab/private
>-@dirrm libexec/GeographicLib/matlab
>-@dirrm libexec/GeographicLib
>-@dirrm %%DATADIR%%/geoids
>-@dirrm %%DATADIR%%/gravity
>-@dirrm %%DATADIR%%/magnetic
>-@dirrm %%DATADIR%%
>-@dirrm share/cmake/GeographicLib
>+@dirrmtry include/GeographicLib
>+@dirrmtry %%PYTHON_SITELIBDIR%%/geographiclib
>+@dirrmtry libexec/GeographicLib/matlab/private
>+@dirrmtry libexec/GeographicLib/matlab
>+@dirrmtry libexec/GeographicLib
>+@dirrmtry share/cmake/GeographicLib
> @dirrmtry share/cmake
>+@dirrmtry %%DATADIR%%/geoids
>+@dirrmtry %%DATADIR%%/gravity
>+@dirrmtry %%DATADIR%%/magnetic
>+@dirrmtry %%DATADIR%%

Actions: View | Diff

Attachments on bug 193968: 147716 | 147717