Index: head/graphics/openorienteering-mapper/Makefile =================================================================== --- head/graphics/openorienteering-mapper/Makefile (revision 516263) +++ head/graphics/openorienteering-mapper/Makefile (revision 516264) @@ -1,56 +1,53 @@ # Created by: Nikolay Korotkiy # $FreeBSD$ PORTNAME= openorienteering-mapper -PORTVERSION= 0.8.4 +PORTVERSION= 0.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= graphics geography MAINTAINER= sikmir@gmail.com COMMENT= Map drawing program from OpenOrienteering LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpolyclipping.so:graphics/polyclipping \ libproj.so:graphics/proj 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 \ network printsupport widgets USE_GITHUB= yes GH_ACCOUNT= OpenOrienteering 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 OPTIONS_SUB= yes DOCS_CMAKE_BOOL= Mapper_WITH_DOCS DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_USE= QT=assistant_run EXAMPLES_CMAKE_BOOL= Mapper_WITH_EXAMPLES 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 TIFF_DESC= Support for TIFF TIFF_USE= QT=imageformats .include Index: head/graphics/openorienteering-mapper/distinfo =================================================================== --- head/graphics/openorienteering-mapper/distinfo (revision 516263) +++ head/graphics/openorienteering-mapper/distinfo (revision 516264) @@ -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 Index: head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt =================================================================== --- head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt (revision 516263) +++ head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt (nonexistent) @@ -1,31 +0,0 @@ ---- translations/CMakeLists.txt.orig 2018-12-23 20:55:50 UTC -+++ translations/CMakeLists.txt -@@ -223,24 +223,24 @@ else() - - set(pre_lupdate ) - set(post_lupdate -- COMMAND sed -i -e "//N\\;/Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" -+ COMMAND gsed -i -e "//N\\;/Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" - ) - if("${ts_filename}" STREQUAL "OpenOrienteering_hu") - # No plural support for Hungarian in Qt - # Save first numerusform in translatorcomment - list(APPEND pre_lupdate -- COMMAND sed -i -f "${save_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" -+ COMMAND gsed -i -f "${save_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" - ) - # Restore first numerusform for translatorcomment - list(APPEND post_lupdate -- COMMAND sed -i -f "${restore_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" -+ COMMAND gsed -i -f "${restore_first_numerusform}" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" - ) - endif() - - add_custom_target(Mapper_${ts_filename}_update - ${pre_lupdate} - COMMAND "${Qt5_LUPDATE_EXECUTABLE}" ${lupdate_options} "@${listfile}" -ts "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" -- COMMAND sed -i -e "//N;/Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" -+ COMMAND gsed -i -e "//N;/Q[A-Z]/,/<.context>/d" "${CMAKE_CURRENT_SOURCE_DIR}/${translation}" - ${post_lupdate} - VERBATIM - ) Property changes on: head/graphics/openorienteering-mapper/files/patch-translations_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh =================================================================== --- head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh (revision 516263) +++ head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh (nonexistent) @@ -1,58 +0,0 @@ ---- translations/translate_text_files.sh.orig 2018-12-23 20:55:50 UTC -+++ translations/translate_text_files.sh -@@ -21,8 +21,8 @@ set -e - - for FILE - do -- echo -n "$FILE" | sed -e 's/.*OpenOrienteering_/Comment[/;s/\.ts$/]=/' -- cat ${FILE} | sed -n -e ' -+ echo -n "$FILE" | gsed -e 's/.*OpenOrienteering_/Comment[/;s/\.ts$/]=/' -+ cat ${FILE} | gsed -n -e ' - /A free software for drawing orienteering maps/! n -@@ -31,22 +31,22 @@ do - p - q - ' --done | sed -e " -+done | gsed -e " - s/^[^=]*\]=\(Comment\)/\1/ - /^[^=]*\]=$/ d - s/"/\"/ - s/'/'/ - " > desktop_file_comment.txt - --sed -i "../packaging/linux/Mapper.desktop" -e ' -+gsed -i "../packaging/linux/Mapper.desktop" -e ' - /^Comment=/ r desktop_file_comment.txt - /^Comment\[/ d - ' - - for FILE - do -- echo -n "$FILE" | sed -e 's/.*OpenOrienteering_/ /' -- cat ${FILE} | sed -n -e ' -+ echo -n "$FILE" | gsed -e 's/.*OpenOrienteering_/ /' -+ cat ${FILE} | gsed -n -e ' - /Orienteering map/! n -@@ -55,7 +55,7 @@ do - p - q - ' --done | sed -e " -+done | gsed -e " - s/^[^>]*>\( *$/ d - s/$/<\/comment>/ -@@ -63,7 +63,7 @@ done | sed -e " - s/'/'/ - " > mime_type_comment.txt - --sed -i "../packaging/linux/openorienteering-mapper.xml" -e ' -+gsed -i "../packaging/linux/openorienteering-mapper.xml" -e ' - /^ */ r mime_type_comment.txt - /^ *]*lang=/ d - ' Property changes on: head/graphics/openorienteering-mapper/files/patch-translations_translate__text__files.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in =================================================================== --- head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in (revision 516263) +++ head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in (revision 516264) @@ -1,8 +1,8 @@ ---- 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() -fixup_bundle_portable("${runtime}" "${dirs}") +#fixup_bundle_portable("${runtime}" "${dirs}") Index: head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt =================================================================== --- head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt (nonexistent) +++ head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt (revision 516264) @@ -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() Property changes on: head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/openorienteering-mapper/pkg-plist =================================================================== --- head/graphics/openorienteering-mapper/pkg-plist (revision 516263) +++ head/graphics/openorienteering-mapper/pkg-plist (revision 516264) @@ -1,98 +1,98 @@ 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 share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/16x16/apps/Mapper.png share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/24x24/apps/Mapper.png share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/256x256/apps/Mapper.png share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/32x32/apps/Mapper.png share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/48x48/apps/Mapper.png share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/512x512/apps/Mapper.png share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-xmap.png share/icons/hicolor/96x96/apps/Mapper.png share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-ocd.png share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-xmap.png share/mime/packages/openorienteering-mapper.xml %%EXAMPLES%%%%DATADIR%%/examples/complete map.omap %%EXAMPLES%%%%DATADIR%%/examples/forest sample.omap %%EXAMPLES%%%%DATADIR%%/examples/overprinting.omap %%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 %%DATADIR%%/symbol sets/4000/ISSOM_4000.omap %%DATADIR%%/symbol sets/5000/Course_Design_5000.omap %%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap %%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 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_en.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_eo.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_es.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fi.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fr.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_hu.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_id.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_it.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ja.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_lv.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nb.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nl.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pl.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_BR.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ru.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_sv.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_uk.qm %%NLS%%%%DATADIR%%/translations/OpenOrienteering_zh_CN.qm %%NLS%%%%DATADIR%%/translations/map_symbols_cs.qm %%NLS%%%%DATADIR%%/translations/map_symbols_da.qm %%NLS%%%%DATADIR%%/translations/map_symbols_de.qm %%NLS%%%%DATADIR%%/translations/map_symbols_eo.qm %%NLS%%%%DATADIR%%/translations/map_symbols_es.qm %%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