svn commit: r489520 - in head/graphics/openorienteering-mapper: . files

Steve Wills swills at FreeBSD.org
Sun Jan 6 18:57:51 UTC 2019 

Author: swills
Date: Sun Jan  6 18:57:47 2019
New Revision: 489520
URL: https://svnweb.freebsd.org/changeset/ports/489520

Log:
  graphics/openorienteering-mapper: update to 0.8.4
  
  PR:		234388
  Submitted by:	Nikolay Korotkiy <sikmir at gmail.com> (maintainer)

Modified:
  head/graphics/openorienteering-mapper/Makefile   (contents, props changed)
  head/graphics/openorienteering-mapper/distinfo   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt   (contents, props changed)
  head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh   (contents, props changed)
  head/graphics/openorienteering-mapper/pkg-descr   (contents, props changed)
  head/graphics/openorienteering-mapper/pkg-plist   (contents, props changed)

Modified: head/graphics/openorienteering-mapper/Makefile
==============================================================================
--- head/graphics/openorienteering-mapper/Makefile	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/Makefile	Sun Jan  6 18:57:47 2019	(r489520)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openorienteering-mapper
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 
@@ -19,22 +18,20 @@ LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping 
 USES=		cmake:noninja compiler:c++14-lang \
 		desktop-file-utils gmake qt:5 shared-mime-info
 USE_QT=		buildtools_build help qmake_build core gui \
-		location network printsupport sensors widgets
+		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
+		-Wno-dev
 
-OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS TEST TIFF
-OPTIONS_DEFAULT=	GDAL
+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
@@ -43,13 +40,15 @@ GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 NLS_CMAKE_BOOL=	Mapper_WITH_NLS
 NLS_BUILD_DEPENDS=	gsed:textproc/gsed
 NLS_USE=	QT=linguisttools_build
-NLS_USES=	gettext-runtime qt:5
+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>

Modified: head/graphics/openorienteering-mapper/distinfo
==============================================================================
--- head/graphics/openorienteering-mapper/distinfo	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/distinfo	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535041627
-SHA256 (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 11e6f2e93442f217f7373bd737a58a75e8e6da81d4365e12691a8dfdf1f01066
-SIZE (OpenOrienteering-mapper-v0.8.2_GH0.tar.gz) = 8586246
+TIMESTAMP = 1545716945
+SHA256 (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = d39c05a84ad222ed278231c89c353174f35682c79f92467cb08d8f101debd8fd
+SIZE (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = 8600295

Modified: head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-08-11 08:14:55 UTC
+--- CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
 +++ CMakeLists.txt
-@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug 
+@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
  # Used for some Linux distributions which do not provide the polyclipping lib.
  option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
  

Modified: head/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-doc_licensing_freebsd-licensing.cmake	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- doc/licensing/freebsd-licensing.cmake.orig	2018-08-23 17:44:26 UTC
+--- doc/licensing/freebsd-licensing.cmake.orig	2018-12-25 07:13:44 UTC
 +++ doc/licensing/freebsd-licensing.cmake
 @@ -0,0 +1,6 @@
 +include("linux-distribution.cmake")

Modified: head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- packaging/CMakeLists.txt.orig	2018-08-11 08:14:55 UTC
+--- packaging/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
 +++ packaging/CMakeLists.txt
 @@ -437,7 +437,7 @@ endforeach(_qt_plugin)
  if(UNIX AND NOT APPLE AND NOT ANDROID)

Modified: head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- packaging/custom_install.cmake.in.orig	2018-08-11 08:14:55 UTC
+--- packaging/custom_install.cmake.in.orig	2018-12-23 20:55:50 UTC
 +++ packaging/custom_install.cmake.in
 @@ -215,4 +215,4 @@ endif()
  set(runtime "")

Modified: head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,14 +1,13 @@
---- src/CMakeLists.txt.orig	2018-08-11 08:14:55 UTC
+--- src/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
 +++ src/CMakeLists.txt
-@@ -286,8 +286,9 @@ target_compile_definitions(Mapper_Common
+@@ -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

Modified: head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,12 +1,10 @@
---- src/gdal/CMakeLists.txt.orig	2018-08-11 08:14:55 UTC
+--- src/gdal/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
 +++ src/gdal/CMakeLists.txt
-@@ -34,8 +34,10 @@ set(MAPPER_GDAL_SOURCES
-   ogr_template.cpp
+@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES
    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()

Modified: head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- src/mapper_config.h.in.orig	2018-08-11 08:14:55 UTC
+--- src/mapper_config.h.in.orig	2018-12-23 20:55:50 UTC
 +++ src/mapper_config.h.in
 @@ -30,6 +30,7 @@
  

Modified: head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- translations/CMakeLists.txt.orig	2018-08-11 08:14:55 UTC
+--- translations/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
 +++ translations/CMakeLists.txt
 @@ -223,24 +223,24 @@ else()
  		

Modified: head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh	Sun Jan  6 18:57:47 2019	(r489520)
@@ -1,4 +1,4 @@
---- translations/translate_text_files.sh.orig	2018-08-11 08:14:55 UTC
+--- translations/translate_text_files.sh.orig	2018-12-23 20:55:50 UTC
 +++ translations/translate_text_files.sh
 @@ -21,8 +21,8 @@ set -e
  

Modified: head/graphics/openorienteering-mapper/pkg-descr
==============================================================================
--- head/graphics/openorienteering-mapper/pkg-descr	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/pkg-descr	Sun Jan  6 18:57:47 2019	(r489520)
@@ -3,4 +3,4 @@ OpenOrienteering Mapper (OOM).
 OpenOrienteering Mapper is a software for creating
 maps for the orienteering sport.
 
-WWW: http://www.openorienteering.org/apps/mapper/
+WWW: https://www.openorienteering.org/apps/mapper/

Modified: head/graphics/openorienteering-mapper/pkg-plist
==============================================================================
--- head/graphics/openorienteering-mapper/pkg-plist	Sun Jan  6 18:40:21 2019	(r489519)
+++ head/graphics/openorienteering-mapper/pkg-plist	Sun Jan  6 18:57:47 2019	(r489520)
@@ -2,8 +2,8 @@ bin/Mapper
 man/man1/Mapper.1.gz
 share/applications/Mapper.desktop
 %%DOCSDIR%%/3rd-party/qtsingleapplication.txt
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qch
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.2 Manual.qhc
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qch
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qhc
 %%DOCSDIR%%/common-licenses/GPL-3.txt
 %%DOCSDIR%%/licensing.html
 share/icons/hicolor/128x128/apps/Mapper.png

More information about the svn-ports-head mailing list