Attachment #200489 for bug #234388

View | Details | Raw Unified | Return to bug 234388
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	openorienteering-mapper
PORTVERSION=	0.8.4
PORTREVISION=	1
DISTVERSIONPREFIX=	v
CATEGORIES=	graphics geography


USES=		cmake:outsource,noninja compiler:c++14-lang \
		desktop-file-utils gmake qt:5 shared-mime-info
USE_QT=		buildtools_build help qmake_build core gui \
		network printsupport widgets
USE_GITHUB=	yes
GH_ACCOUNT=	OpenOrienteering
GH_PROJECT=	mapper

CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
		-DMapper_PACKAGE_NAME=${PORTNAME} \
		-Wno-dev
		-DQt5Help_QCOLLECTIONGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator

OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
OPTIONS_SUB=	yes
DOCS_CMAKE_BOOL=	Mapper_WITH_DOCS
DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
DOCS_USES=	qt:5
DOCS_USE=	QT=assistant_run
EXAMPLES_CMAKE_BOOL=	Mapper_WITH_EXAMPLES
GDAL_DESC=	Use the GDAL library

NLS_CMAKE_BOOL=	Mapper_WITH_NLS
NLS_BUILD_DEPENDS=	gsed:textproc/gsed
NLS_USE=	QT=linguisttools_build
NLS_USES=	gettext-runtime
POSITIONING_DESC=	GPS positioning
POSITIONING_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0
POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1
POSITIONING_USE=	QT=location,sensors
TEST_CMAKE_BOOL=	Mapper_WITH_TEST
TEST_USES=	qt:5
TEST_USE=	QT=testlib_build
TEST_TEST_TARGET=	test
TIFF_DESC=	Support for TIFF
TIFF_USES=	qt:5
TIFF_USE=	QT=imageformats

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)w/graphics/openorienteering-mapper/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535041627	1	TIMESTAMP = 1545716945
2	SHA256 (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 11e6f2e93442f217f7373bd737a58a75e8e6da81d4365e12691a8dfdf1f01066	2	SHA256 (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = d39c05a84ad222ed278231c89c353174f35682c79f92467cb08d8f101debd8fd
3	SIZE (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 8586246	3	SIZE (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = 8600295

Lines 1-6 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-CMakeLists.txt (-2 / +2 lines)
1	--- CMakeLists.txt.orig 2018-08-11 08:14:55 UTC	1	--- CMakeLists.txt.orig 2018-12-23 20:55:50 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug	3	@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
4	# Used for some Linux distributions which do not provide the polyclipping lib.	4	# Used for some Linux distributions which do not provide the polyclipping lib.
5	option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)	5	option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
6		6

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake (-1 / +1 lines)
1	--- doc/licensing/freebsd-licensing.cmake.orig 2018-08-23 17:44:26 UTC	1	--- doc/licensing/freebsd-licensing.cmake.orig 2018-12-25 07:13:44 UTC
2	+++ doc/licensing/freebsd-licensing.cmake	2	+++ doc/licensing/freebsd-licensing.cmake
3	@@ -0,0 +1,6 @@	3	@@ -0,0 +1,6 @@
4	+include("linux-distribution.cmake")	4	+include("linux-distribution.cmake")

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt (-1 / +1 lines)
1	--- packaging/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC	1	--- packaging/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC
2	+++ packaging/CMakeLists.txt	2	+++ packaging/CMakeLists.txt
3	@@ -437,7 +437,7 @@ endforeach(_qt_plugin)	3	@@ -437,7 +437,7 @@ endforeach(_qt_plugin)
4	if(UNIX AND NOT APPLE AND NOT ANDROID)	4	if(UNIX AND NOT APPLE AND NOT ANDROID)

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in (-1 / +1 lines)
1	--- packaging/custom_install.cmake.in.orig 2018-08-11 08:14:55 UTC	1	--- packaging/custom_install.cmake.in.orig 2018-12-23 20:55:50 UTC
2	+++ packaging/custom_install.cmake.in	2	+++ packaging/custom_install.cmake.in
3	@@ -215,4 +215,4 @@ endif()	3	@@ -215,4 +215,4 @@ endif()
4	set(runtime "")	4	set(runtime "")




--- src/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+++ src/CMakeLists.txt
@@ -286,7 +286,9 @@ target_compile_definitions(Mapper_Common PRIVATE
   # MAPPER_ENABLE_COMPATIBILITY
 )
 
-mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
-
+if(Mapper_WITH_NLS)
+	mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
+endif()
 
 # Mapper executable
 
 # Mapper executable




--- src/gdal/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+++ src/gdal/CMakeLists.txt
@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES
   ogr_template.cpp
   mapper-osmconf.ini
 )
 	
-mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
+
+if(Mapper_WITH_NLS)
+	mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
+endif()

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in (-1 / +1 lines)
1	--- src/mapper_config.h.in.orig 2018-08-11 08:14:55 UTC	1	--- src/mapper_config.h.in.orig 2018-12-23 20:55:50 UTC
2	+++ src/mapper_config.h.in	2	+++ src/mapper_config.h.in
3	@@ -30,6 +30,7 @@	3	@@ -30,6 +30,7 @@
4		4

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt (-1 / +1 lines)
1	--- translations/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC	1	--- translations/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC
2	+++ translations/CMakeLists.txt	2	+++ translations/CMakeLists.txt
3	@@ -223,24 +223,24 @@ else()	3	@@ -223,24 +223,24 @@ else()
4		4

Lines 1-4 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh (-1 / +1 lines)
1	--- translations/translate_text_files.sh.orig 2018-08-11 08:14:55 UTC	1	--- translations/translate_text_files.sh.orig 2018-12-23 20:55:50 UTC
2	+++ translations/translate_text_files.sh	2	+++ translations/translate_text_files.sh
3	@@ -21,8 +21,8 @@ set -e	3	@@ -21,8 +21,8 @@ set -e
4		4

Lines 3-6 OpenOrienteering Mapper (OOM). Link Here

(-)w/graphics/openorienteering-mapper/pkg-descr (-1 / +1 lines)
3	OpenOrienteering Mapper is a software for creating	3	OpenOrienteering Mapper is a software for creating
4	maps for the orienteering sport.	4	maps for the orienteering sport.
5		5
6	WWW: http://www.openorienteering.org/apps/mapper/	6	WWW: https://www.openorienteering.org/apps/mapper/

Lines 2-9 bin/Mapper Link Here

(-)w/graphics/openorienteering-mapper/pkg-plist (-2 / +2 lines)
2	man/man1/Mapper.1.gz	2	man/man1/Mapper.1.gz
3	share/applications/Mapper.desktop	3	share/applications/Mapper.desktop
4	%%DOCSDIR%%/3rd-party/qtsingleapplication.txt	4	%%DOCSDIR%%/3rd-party/qtsingleapplication.txt
5	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qch	5	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qch
6	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qhc	6	%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qhc
7	%%DOCSDIR%%/common-licenses/GPL-3.txt	7	%%DOCSDIR%%/common-licenses/GPL-3.txt
8	%%DOCSDIR%%/licensing.html	8	%%DOCSDIR%%/licensing.html
9	share/icons/hicolor/128x128/apps/Mapper.png	9	share/icons/hicolor/128x128/apps/Mapper.png

Return to bug 234388

Lines 2-9 Link Here

(-)w/graphics/openorienteering-mapper/Makefile (-11 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openorienteering-mapper	4	PORTNAME= openorienteering-mapper
5	PORTVERSION= 0.8.2	5	PORTVERSION= 0.8.4
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
9		8
Lines 19-40 LIB_DEPENDS= libpolyclipping.so:graphics/polyclipping \ Link Here
19	USES= cmake:outsource,noninja compiler:c++14-lang \	18	USES= cmake:outsource,noninja compiler:c++14-lang \
20	desktop-file-utils gmake qt:5 shared-mime-info	19	desktop-file-utils gmake qt:5 shared-mime-info
21	USE_QT= buildtools_build help qmake_build core gui \	20	USE_QT= buildtools_build help qmake_build core gui \
22	location network printsupport sensors widgets	21	network printsupport widgets
23	USE_GITHUB= yes	22	USE_GITHUB= yes
24	GH_ACCOUNT= OpenOrienteering	23	GH_ACCOUNT= OpenOrienteering
25	GH_PROJECT= mapper	24	GH_PROJECT= mapper
26		25
27	CMAKE_ARGS+= -DLICENSING_PROVIDER=freebsd \	26	CMAKE_ARGS+= -DLICENSING_PROVIDER=freebsd \
28	-DMapper_PACKAGE_NAME=${PORTNAME} \	27	-DMapper_PACKAGE_NAME=${PORTNAME} \
29	-Wno-dev \	28	-Wno-dev
30	-DQt5Help_QCOLLECTIONGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator
31		29
32	OPTIONS_DEFINE= DOCS EXAMPLES GDAL NLS TEST TIFF	30	OPTIONS_DEFINE= DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
33	OPTIONS_DEFAULT= GDAL	31	OPTIONS_DEFAULT= DOCS EXAMPLES GDAL NLS TIFF
34	OPTIONS_SUB= yes	32	OPTIONS_SUB= yes
35	DOCS_CMAKE_BOOL= Mapper_WITH_DOCS	33	DOCS_CMAKE_BOOL= Mapper_WITH_DOCS
36	DOCS_BUILD_DEPENDS= doxygen:devel/doxygen	34	DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
37	DOCS_USES= qt:5
38	DOCS_USE= QT=assistant_run	35	DOCS_USE= QT=assistant_run
39	EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES	36	EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES
40	GDAL_DESC= Use the GDAL library	37	GDAL_DESC= Use the GDAL library
Lines 43-55 GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal Link Here
43	NLS_CMAKE_BOOL= Mapper_WITH_NLS	40	NLS_CMAKE_BOOL= Mapper_WITH_NLS
44	NLS_BUILD_DEPENDS= gsed:textproc/gsed	41	NLS_BUILD_DEPENDS= gsed:textproc/gsed
45	NLS_USE= QT=linguisttools_build	42	NLS_USE= QT=linguisttools_build
46	NLS_USES= gettext-runtime qt:5	43	NLS_USES= gettext-runtime
		44	POSITIONING_DESC= GPS positioning
		45	POSITIONING_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0
		46	POSITIONING_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1
		47	POSITIONING_USE= QT=location,sensors
47	TEST_CMAKE_BOOL= Mapper_WITH_TEST	48	TEST_CMAKE_BOOL= Mapper_WITH_TEST
48	TEST_USES= qt:5
49	TEST_USE= QT=testlib_build	49	TEST_USE= QT=testlib_build
50	TEST_TEST_TARGET= test	50	TEST_TEST_TARGET= test
51	TIFF_DESC= Support for TIFF	51	TIFF_DESC= Support for TIFF
52	TIFF_USES= qt:5
53	TIFF_USE= QT=imageformats	52	TIFF_USE= QT=imageformats
54		53
55	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt (-4 / +3 lines)
1	--- src/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC	1	--- src/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -286,8 +286,9 @@ target_compile_definitions(Mapper_Common	3	@@ -286,7 +286,9 @@ target_compile_definitions(Mapper_Common PRIVATE
4	# MAPPER_ENABLE_COMPATIBILITY	4	# MAPPER_ENABLE_COMPATIBILITY
5	)	5	)
6		6
7	-mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})	7	-mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
8	-
9	+if(Mapper_WITH_NLS)	8	+if(Mapper_WITH_NLS)
10	+ mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})	9	+ mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
11	+endif()	10	+endif()
12		11
13	# Mapper executable
14		12
		13	# Mapper executable

Lines 1-12 Link Here

(-)w/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt (-5 / +3 lines)
1	--- src/gdal/CMakeLists.txt.orig 2018-08-11 08:14:55 UTC	1	--- src/gdal/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC
2	+++ src/gdal/CMakeLists.txt	2	+++ src/gdal/CMakeLists.txt
3	@@ -34,8 +34,10 @@ set(MAPPER_GDAL_SOURCES	3	@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES
4	ogr_template.cpp
5	mapper-osmconf.ini	4	mapper-osmconf.ini
6	)	5	)
7	-	6
8	-mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})	7	-mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
9	+
10	+if(Mapper_WITH_NLS)	8	+if(Mapper_WITH_NLS)
11	+ mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})	9	+ mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
12	+endif()	10	+endif()