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

Kai Knoblich kai at FreeBSD.org
Fri Nov 1 20:16:32 UTC 2019 

Author: kai
Date: Fri Nov  1 20:16:31 2019
New Revision: 516264
URL: https://svnweb.freebsd.org/changeset/ports/516264

Log:
  graphics/openorienteering-mapper: Update to 0.9.0
  
  * Remove textproc/gsed from BUILD_DEPENDS for the NLS option and drop the
    related patches for it as sed(1) works fine.
  
  * It's also no longer required to use the deprecated "proj_api.h" from
    graphics/proj thus remove the workaround with CXXFLAGS that was introduced
    with r505194.
  
  * Rebase the patch for packaging/custom_install.cmake.in to avoid warnings
    while patching because the file has now less lines since the last release.
  
  Changelog:
  
  https://github.com/OpenOrienteering/mapper/releases/tag/v0.9.0
  
  PR:		241444
  Submitted by:	Nikolay Korotkiy <sikmir at gmail.com> (maintainer)

Added:
  head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt   (contents, props changed)
Deleted:
  head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt
  head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh
Modified:
  head/graphics/openorienteering-mapper/Makefile
  head/graphics/openorienteering-mapper/distinfo
  head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
  head/graphics/openorienteering-mapper/pkg-plist

Modified: head/graphics/openorienteering-mapper/Makefile
==============================================================================
--- head/graphics/openorienteering-mapper/Makefile	Fri Nov  1 19:05:19 2019	(r516263)
+++ head/graphics/openorienteering-mapper/Makefile	Fri Nov  1 20:16:31 2019	(r516264)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openorienteering-mapper
-PORTVERSION=	0.8.4
+PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	graphics geography
 
 MAINTAINER=	sikmir at gmail.com
@@ -27,7 +26,6 @@ GH_PROJECT=	mapper
 CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
 		-DMapper_PACKAGE_NAME=${PORTNAME} \
 		-Wno-dev
-CXXFLAGS+=	"-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
 OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
@@ -40,13 +38,12 @@ GDAL_DESC=	Use the GDAL library
 GDAL_CMAKE_BOOL=	Mapper_USE_GDAL
 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
 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
+POSITIONING_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0
+POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1
+POSITIONING_USE=	QT=location,sensors,serialport
 TEST_CMAKE_BOOL=	Mapper_WITH_TEST
 TEST_USE=	QT=testlib_build
 TEST_TEST_TARGET=	test

Modified: head/graphics/openorienteering-mapper/distinfo
==============================================================================
--- head/graphics/openorienteering-mapper/distinfo	Fri Nov  1 19:05:19 2019	(r516263)
+++ head/graphics/openorienteering-mapper/distinfo	Fri Nov  1 20:16:31 2019	(r516264)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545716945
-SHA256 (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = d39c05a84ad222ed278231c89c353174f35682c79f92467cb08d8f101debd8fd
-SIZE (OpenOrienteering-mapper-v0.8.4_GH0.tar.gz) = 8600295
+TIMESTAMP = 1571822907
+SHA256 (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = d545e6d798346a34eb37240d8ed6218039adef42b4edf9384ee34d8eff96cb59
+SIZE (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = 9414101

Modified: head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
==============================================================================
--- head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	Fri Nov  1 19:05:19 2019	(r516263)
+++ head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	Fri Nov  1 20:16:31 2019	(r516264)
@@ -1,6 +1,6 @@
---- packaging/custom_install.cmake.in.orig	2018-12-23 20:55:50 UTC
-+++ packaging/custom_install.cmake.in
-@@ -215,4 +215,4 @@ endif()
+--- packaging/custom_install.cmake.in.orig	2019-10-23 12:42:51.349480000 +0300
++++ packaging/custom_install.cmake.in	2019-10-23 12:42:57.488297000 +0300
+@@ -122,4 +122,4 @@
  set(runtime "")
  set(dirs "@MAPPER_LIB_HINTS@")
  handle_qt_conf()

Added: head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt	Fri Nov  1 20:16:31 2019	(r516264)
@@ -0,0 +1,18 @@
+Add translation files only if the NLS knob is set
+
+--- src/sensors/CMakeLists.txt.orig	2019-10-23 13:52:38.938027000 +0300
++++ src/sensors/CMakeLists.txt	2019-10-23 13:53:09.513288000 +0300
+@@ -104,7 +104,9 @@
+ 
+ # Translations
+ 
+-mapper_translations_sources(
+-  ${MAPPER_SENSORS_SOURCES}
+-  ${POWERSHELL_POSITION_SOURCES}
+-)
++if(Mapper_WITH_NLS)
++	mapper_translations_sources(
++	  ${MAPPER_SENSORS_SOURCES}
++	  ${POWERSHELL_POSITION_SOURCES}
++	)
++endif()

Modified: head/graphics/openorienteering-mapper/pkg-plist
==============================================================================
--- head/graphics/openorienteering-mapper/pkg-plist	Fri Nov  1 19:05:19 2019	(r516263)
+++ head/graphics/openorienteering-mapper/pkg-plist	Fri Nov  1 20:16:31 2019	(r516264)
@@ -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.4 Manual.qch
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.8.4 Manual.qhc
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qch
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qhc
 %%DOCSDIR%%/common-licenses/GPL-3.txt
 %%DOCSDIR%%/licensing.html
 share/icons/hicolor/128x128/apps/Mapper.png
@@ -37,13 +37,13 @@ share/mime/packages/openorienteering-mapper.xml
 %%GDAL%%%%DATADIR%%/gdal/mapper-osmconf.ini
 %%DATADIR%%/symbol sets/10000/Course_Design_10000.omap
 %%DATADIR%%/symbol sets/10000/ISMTBOM_10000.omap
+%%DATADIR%%/symbol sets/10000/ISOM 2017-2_10000.omap
 %%DATADIR%%/symbol sets/10000/ISOM2000_10000.omap
-%%DATADIR%%/symbol sets/10000/ISOM2017_10000.omap
 %%DATADIR%%/symbol sets/10000/ISSkiOM_10000.omap
 %%DATADIR%%/symbol sets/15000/Course_Design_15000.omap
 %%DATADIR%%/symbol sets/15000/ISMTBOM_15000.omap
+%%DATADIR%%/symbol sets/15000/ISOM 2017-2_15000.omap
 %%DATADIR%%/symbol sets/15000/ISOM2000_15000.omap
-%%DATADIR%%/symbol sets/15000/ISOM2017_15000.omap
 %%DATADIR%%/symbol sets/15000/ISSkiOM_15000.omap
 %%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap
 %%DATADIR%%/symbol sets/4000/Course_Design_4000.omap
@@ -53,10 +53,10 @@ share/mime/packages/openorienteering-mapper.xml
 %%DATADIR%%/symbol sets/5000/ISSOM_5000.omap
 %%DATADIR%%/symbol sets/5000/ISSkiOM_5000.omap
 %%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap
-%%DATADIR%%/symbol sets/ISOM2000-ISOM2017.crt
+%%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt
 %%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt
+%%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt
 %%DATADIR%%/symbol sets/OSM-ISOM2000.crt
-%%DATADIR%%/symbol sets/OSM-ISOM2017.crt
 %%DATADIR%%/symbol sets/OSM-ISSOM.crt
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
@@ -87,12 +87,12 @@ share/mime/packages/openorienteering-mapper.xml
 %%NLS%%%%DATADIR%%/translations/map_symbols_fi.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_fr.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm
+%%NLS%%%%DATADIR%%/translations/map_symbols_it.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm
 %%NLS%%%%DATADIR%%/translations/qt_eo.qm
 %%NLS%%%%DATADIR%%/translations/qt_et.qm
 %%NLS%%%%DATADIR%%/translations/qt_id.qm
-%%NLS%%%%DATADIR%%/translations/qt_lv.qm
 %%NLS%%%%DATADIR%%/translations/qt_nb.qm
 %%NLS%%%%DATADIR%%/translations/qt_nl.qm

More information about the svn-ports-all mailing list