View | Details | Raw Unified | Return to bug 218158 | Differences between
and this patch

Collapse All | Expand All

(-)astro/geographiclib/Makefile (-10 / +36 lines)
Lines 2-13 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	geographiclib
4
PORTNAME=	geographiclib
5
PORTVERSION=	1.46
5
PORTVERSION=	1.47
6
PORTREVISION=	1
6
DISTVERSIONSUFFIX=	-patch1
7
CATEGORIES=	astro
7
CATEGORIES=	astro
8
MASTER_SITES=	SF/geographiclib/distrib\
8
MASTER_SITES=	SF/geographiclib/distrib\
9
		SF/geographiclib:geoids,gravity,magnetic
9
		SF/geographiclib:geoids,gravity,magnetic
10
DISTNAME=	GeographicLib-${PORTVERSION}
10
DISTNAME=	GeographicLib-${PORTVERSION}${DISTVERSIONSUFFIX}
11
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
11
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
12
DIST_SUBDIR=	GeographicLib
12
DIST_SUBDIR=	GeographicLib
13
13
Lines 17-40 Link Here
17
LICENSE=	MIT
17
LICENSE=	MIT
18
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
18
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
19
19
20
BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
20
USES=		compiler:c++14-lang python
21
21
WRKSRC=		${WRKDIR}/GeographicLib-${PORTVERSION}
22
USES=		autoreconf compiler:c++11-lang gmake libtool python
23
PORTDOCS=	*
22
PORTDOCS=	*
24
FETCH_ENV+=	HTTP_REFERER=
23
FETCH_ENV+=	HTTP_REFERER=
25
GNU_CONFIGURE=	yes
26
MAKE_ARGS+=	geographiclib_data=${DATADIR:Q}
24
MAKE_ARGS+=	geographiclib_data=${DATADIR:Q}
27
MAKE_ARGS+=	pythondir=${PYTHON_SITELIBDIR}/geographiclib
28
INSTALL_TARGET=	install-strip
29
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
30
26
31
OPTIONS_DEFINE=	DOXYGEN PERL
27
OPTIONS_DEFINE=	CMAKE DOXYGEN PERL
32
OPTIONS_DEFAULT=	DOXYGEN PERL\
28
OPTIONS_DEFAULT=	DOXYGEN PERL\
33
			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
29
			GEOID_EGM96_5 GRAVITY_EGM96 GRAVITY_WGS84\
34
			MAGNETIC_WMM2015 MAGNETIC_IGRF12
30
			MAGNETIC_WMM2015 MAGNETIC_IGRF12
31
CMAKE_DESC=	CMake support
35
PERL_DESC=	Build documentation with pod2man and pod2html
32
PERL_DESC=	Build documentation with pod2man and pod2html
36
OPTIONS_GROUP=	DATASETS
33
OPTIONS_GROUP=	DATASETS
37
OPTIONS_SUB=	yes
34
OPTIONS_SUB=	yes
35
CMAKE_CONFIGURE_OFF=	--with-pkgconfigdir=${PREFIX:Q}/libdata/pkgconfig
36
CMAKE_CMAKE_ON=	-DINSTALL_PYTHON_DIR:STRING=${PYTHON_SITELIBDIR:Q}\
37
		-DINSTALL_DOC_DIR:STRING=${DOCSDIR:Q}
38
CMAKE_VARS_OFF=	GNU_CONFIGURE=yes
39
CMAKE_BUILD_DEPENDS_OFF=	autoconf-archive>=0.2015.02.04:devel/autoconf-archive
40
CMAKE_INSTALL_TARGET_OFF=	install-strip
41
CMAKE_MAKE_ARGS_OFF=	pythondir=${PYTHON_SITELIBDIR:Q}/geographiclib\
42
		cmakedir=\$$\(datadir\)/cmake/Modules
43
CMAKE_USES=	cmake
44
CMAKE_USES_OFF=	autoreconf gmake libtool pkgconfig
38
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
45
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
39
DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
46
DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
40
PERL_USE=	PERL5=build
47
PERL_USE=	PERL5=build
Lines 74-79 Link Here
74
	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
81
	${REINPLACE_CMD} -e '/wget/s/wget -O/fetch -o /'\
75
		${WRKSRC}/tools/geographiclib-get-*.sh
82
		${WRKSRC}/tools/geographiclib-get-*.sh
76
83
84
post-patch-CMAKE-on:
85
	${REINPLACE_CMD} -E\
86
		-e '/DESTINATION.*\/pkgconfig/s,lib,libdata,'\
87
		${WRKSRC}/cmake/CMakeLists.txt
88
	${REINPLACE_CMD} -E\
89
		-e '/set \(INSTALL_DOC_DIR/d'\
90
		-e '/DOXYGEN_FOUND/{x;s,^.*$$,find_package(Doxygen),;G;}'\
91
		${WRKSRC}/doc/CMakeLists.txt
92
	${REINPLACE_CMD} -E\
93
		-e 's,(DESTINATION.*)share/,\1,'\
94
		-e '/DOXYGEN_FOUND/{x;s,^.*$$,find_package(Doxygen),;G;}'\
95
		${WRKSRC}/man/CMakeLists.txt
96
	${REINPLACE_CMD} -E\
97
		-e '/set \(INSTALL_PYTHON_DIR/d'\
98
		${WRKSRC}/python/geographiclib/CMakeLists.txt
99
77
.for n in ${GEOID_NAMES}
100
.for n in ${GEOID_NAMES}
78
post-install-GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-geoids
101
post-install-GEOID_${n:C/[^0-9A-Z_a-z]/_/g:tu}-on: install-datasets-geoids
79
.endfor
102
.endfor
Lines 111-116 Link Here
111
		s/[^0-9A-Za-z]/_/g;\
134
		s/[^0-9A-Za-z]/_/g;\
112
		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
135
		y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;\
113
		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
136
		s/^/%%/;s/$$/%%/;G;s/\n//;}'\
137
		-e '/^lib\/.*.a$$/{s|^|%%NO_CMAKE%%|;}'\
138
		-e '/^share\/cmake\/[^\/]\{1,\}\/F/{s|^|%%NO_CMAKE%%|;}'\
139
		-e '/^lib\/cmake\/GeographicLib\/g/{s|^|%%CMAKE%%|;}'\
114
		${PLIST}
140
		${PLIST}
115
141
116
.include <bsd.port.mk>
142
.include <bsd.port.mk>
(-)astro/geographiclib/distinfo (-2 / +3 lines)
Lines 1-5 Link Here
1
SHA256 (GeographicLib/GeographicLib-1.46.tar.gz) = 3a0606fd99fb099572ba1923f556b05b545965359edb92930a658fc99172d962
1
TIMESTAMP = 1490313600
2
SIZE (GeographicLib/GeographicLib-1.46.tar.gz) = 2208372
2
SHA256 (GeographicLib/GeographicLib-1.47-patch1.tar.gz) = 6a781d03644904a0ea794938e10b2b417fc6e260cf922d3f79277a772ff0a983
3
SIZE (GeographicLib/GeographicLib-1.47-patch1.tar.gz) = 2238894
3
SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
4
SHA256 (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 18bc3e2b55c4f9f2f9ba8d14380dc47cc5c0d00dc2363b723d2305f30a91498e
4
SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
5
SIZE (GeographicLib/geoids-distrib/egm84-30.tar.bz2) = 416481
5
SHA256 (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 579e3dad2f33b54f1fed16edb3ed9d4ae8cdad6ea064f7375af30d678eb2e51c
6
SHA256 (GeographicLib/geoids-distrib/egm84-15.tar.bz2) = 579e3dad2f33b54f1fed16edb3ed9d4ae8cdad6ea064f7375af30d678eb2e51c
(-)astro/geographiclib/pkg-plist (-3 / +11 lines)
Lines 38-43 Link Here
38
include/GeographicLib/MagneticCircle.hpp
38
include/GeographicLib/MagneticCircle.hpp
39
include/GeographicLib/MagneticModel.hpp
39
include/GeographicLib/MagneticModel.hpp
40
include/GeographicLib/Math.hpp
40
include/GeographicLib/Math.hpp
41
include/GeographicLib/NearestNeighbor.hpp
41
include/GeographicLib/NormalGravity.hpp
42
include/GeographicLib/NormalGravity.hpp
42
include/GeographicLib/OSGB.hpp
43
include/GeographicLib/OSGB.hpp
43
include/GeographicLib/PolarStereographic.hpp
44
include/GeographicLib/PolarStereographic.hpp
Lines 51-60 Link Here
51
include/GeographicLib/TransverseMercatorExact.hpp
52
include/GeographicLib/TransverseMercatorExact.hpp
52
include/GeographicLib/UTMUPS.hpp
53
include/GeographicLib/UTMUPS.hpp
53
include/GeographicLib/Utility.hpp
54
include/GeographicLib/Utility.hpp
54
lib/libGeographic.a
55
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-config-version.cmake
56
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-config.cmake
57
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-namespace-targets-%%CMAKE_BUILD_TYPE%%.cmake
58
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-namespace-targets.cmake
59
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-targets-%%CMAKE_BUILD_TYPE%%.cmake
60
%%CMAKE%%lib/cmake/GeographicLib/geographiclib-targets.cmake
61
%%NO_CMAKE%%lib/libGeographic.a
55
lib/libGeographic.so
62
lib/libGeographic.so
56
lib/libGeographic.so.17
63
lib/libGeographic.so.17
57
lib/libGeographic.so.17.0.0
64
lib/libGeographic.so.17.1.0
58
lib/node_modules/geographiclib/LICENSE.txt
65
lib/node_modules/geographiclib/LICENSE.txt
59
lib/node_modules/geographiclib/README.md
66
lib/node_modules/geographiclib/README.md
60
lib/node_modules/geographiclib/geographiclib.js
67
lib/node_modules/geographiclib/geographiclib.js
Lines 76-81 Link Here
76
%%PYTHON_SITELIBDIR%%/geographiclib/polygonarea.py
83
%%PYTHON_SITELIBDIR%%/geographiclib/polygonarea.py
77
%%PYTHON_SITELIBDIR%%/geographiclib/test/__init__.py
84
%%PYTHON_SITELIBDIR%%/geographiclib/test/__init__.py
78
%%PYTHON_SITELIBDIR%%/geographiclib/test/test_geodesic.py
85
%%PYTHON_SITELIBDIR%%/geographiclib/test/test_geodesic.py
86
libdata/pkgconfig/geographiclib.pc
79
man/man1/CartConvert.1.gz
87
man/man1/CartConvert.1.gz
80
man/man1/ConicProj.1.gz
88
man/man1/ConicProj.1.gz
81
man/man1/GeoConvert.1.gz
89
man/man1/GeoConvert.1.gz
Lines 93-99 Link Here
93
sbin/geographiclib-get-geoids
101
sbin/geographiclib-get-geoids
94
sbin/geographiclib-get-gravity
102
sbin/geographiclib-get-gravity
95
sbin/geographiclib-get-magnetic
103
sbin/geographiclib-get-magnetic
96
share/cmake/GeographicLib/FindGeographicLib.cmake
104
%%NO_CMAKE%%share/cmake/Modules/FindGeographicLib.cmake
97
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm
105
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm
98
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm.aux.xml
106
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.pgm.aux.xml
99
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.wld
107
%%GEOID_EGM2008_1%%%%DATADIR%%/geoids/egm2008-1.wld

Return to bug 218158