CVS commit: pkgsrc/geography/opencpn

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/geography/opencpn
From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
Date: Mon, 25 Mar 2019 11:34:05 +0000

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Mar 25 11:34:05 UTC 2019

Modified Files:
        pkgsrc/geography/opencpn: Makefile PLIST distinfo
        pkgsrc/geography/opencpn/patches: patch-CMakeLists.txt
            patch-FindPortaudio.cmake patch-plugins_chartdldr_pi_CMakeLists.txt
            patch-plugins_dashboard_pi_CMakeLists.txt
            patch-plugins_grib_pi_CMakeLists.txt
Removed Files:
        pkgsrc/geography/opencpn/patches:
            patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake
            patch-plugins_wmm_pi_cmake_PluginConfigure.cmake
            patch-plugins_wmm_pi_src_MagneticPlotMap.cpp patch-src_chart1.cpp
            patch-src_crashprint.cpp patch-src_tcmgr.cpp

Log Message:
Update OpenCPN to 5.0.0. Changes since 4.8.8:
As a successor to OpenCPN Version 4.8, OpenCPN Version 5.0 contains many
new features and enhanced functions.
Among them are:

..Redesigned user interface, incorporating modern user interface elements and
  concepts.
..Support for multiple chart views simultaneously, using different charts
  display options if desired.
..User defined templates for easy recall of multiple configurations.
..Support for the widely available MBTiles chart format.
..Extended options for route and Waypoint creation.
..Expanded display of vector chart (ENC) information, including embedded
  images.
..Measurably improved performance and reliability over all supported platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/geography/opencpn/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/opencpn/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/geography/opencpn/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake \
    pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt \
    pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake \
    pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake \
    pkgsrc/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp \
    pkgsrc/geography/opencpn/patches/patch-src_chart1.cpp \
    pkgsrc/geography/opencpn/patches/patch-src_tcmgr.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/opencpn/patches/patch-src_crashprint.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/opencpn/Makefile
diff -u pkgsrc/geography/opencpn/Makefile:1.30 pkgsrc/geography/opencpn/Makefile:1.31
--- pkgsrc/geography/opencpn/Makefile:1.30      Thu Dec 13 19:51:58 2018
+++ pkgsrc/geography/opencpn/Makefile   Mon Mar 25 11:34:05 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2018/12/13 19:51:58 adam Exp $
+# $NetBSD: Makefile,v 1.31 2019/03/25 11:34:05 bouyer Exp $
 
-DISTNAME=      OpenCPN-4.8.8
+DISTNAME=      OpenCPN-5.0.0
 PKGNAME=       ${DISTNAME:S/OpenCPN/opencpn/}
-PKGREVISION=   1
+#PKGREVISION=  1
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenCPN/}
 GITHUB_PROJECT=        OpenCPN
-GITHUB_TAG=    v4.8.8
+GITHUB_TAG=    v5.0.0
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
@@ -14,7 +14,7 @@ HOMEPAGE=     http://www.opencpn.org/
 COMMENT=       Concise ChartPlotter/Navigator
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
 USE_TOOLS+=    gettext pkg-config
 USE_CMAKE=     yes
 
@@ -40,6 +40,7 @@ SUBST_SED.prefix=     -e s,"/usr/local,"${PR
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=      ${EXPORT_SYMBOLS_LDFLAGS}
 
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/cmake/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"

Index: pkgsrc/geography/opencpn/PLIST
diff -u pkgsrc/geography/opencpn/PLIST:1.8 pkgsrc/geography/opencpn/PLIST:1.9
--- pkgsrc/geography/opencpn/PLIST:1.8  Mon Aug 27 15:48:15 2018
+++ pkgsrc/geography/opencpn/PLIST      Mon Mar 25 11:34:05 2019
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.8 2018/08/27 15:48:15 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/03/25 11:34:05 bouyer Exp $
 bin/opencpn
 lib/opencpn/libchartdldr_pi.so
 lib/opencpn/libdashboard_pi.so
 lib/opencpn/libgrib_pi.so
 lib/opencpn/libwmm_pi.so
+share/appdata/opencpn.appdata.xml
 share/applications/opencpn.desktop
 share/doc/opencpn/changelog
 share/doc/opencpn/copyright
 share/icons/hicolor/48x48/apps/opencpn.png
+share/icons/hicolor/64x64/apps/opencpn.png
 share/icons/hicolor/scalable/apps/opencpn.svg
 share/locale/ar_SA/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/ar_SA/LC_MESSAGES/opencpn-dashboard_pi.mo
@@ -81,6 +83,10 @@ share/locale/id_ID/LC_MESSAGES/opencpn-c
 share/locale/id_ID/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/id_ID/LC_MESSAGES/opencpn-grib_pi.mo
 share/locale/id_ID/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/is_IS/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/is_IS/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/is_IS/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/is_IS/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/it/LC_MESSAGES/opencpn.mo
 share/locale/it_IT/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/it_IT/LC_MESSAGES/opencpn-dashboard_pi.mo
@@ -152,12 +158,51 @@ share/locale/vi_VN/LC_MESSAGES/opencpn-d
 share/locale/vi_VN/LC_MESSAGES/opencpn-grib_pi.mo
 share/locale/vi_VN/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/vi_VN/LC_MESSAGES/opencpn.mo
+share/locale/zh_CN/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/zh_CN/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/zh_CN/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/zh_CN/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn.mo
+share/man/man1/opencpn.1
+share/opencpn/COPYING.gplv2
+share/opencpn/COPYING.gplv3
+share/opencpn/COPYING.lgplv2
+share/opencpn/COPYING.lgplv3
 share/opencpn/CoC-909_2013-InlandECDIS_20170308s.pdf
+share/opencpn/LICENSING
+share/opencpn/LINUX_DEVICES.md
+share/opencpn/authors.html
+share/opencpn/doc/50info/MBT1.jpg
+share/opencpn/doc/50info/bridge1.jpg
+share/opencpn/doc/50info/bridge2.jpg
+share/opencpn/doc/50info/chdow.jpg
+share/opencpn/doc/50info/conf1.jpg
+share/opencpn/doc/50info/conf2.jpg
+share/opencpn/doc/50info/conf3.jpg
+share/opencpn/doc/50info/conf4.jpg
+share/opencpn/doc/50info/config1.jpg
+share/opencpn/doc/50info/config2.jpg
+share/opencpn/doc/50info/cpb1.jpg
+share/opencpn/doc/50info/cpb2.jpg
+share/opencpn/doc/50info/cpb3.jpg
+share/opencpn/doc/50info/intro1.jpg
+share/opencpn/doc/50info/maintool1.jpg
+share/opencpn/doc/50info/mark1.jpg
+share/opencpn/doc/50info/mark2.jpg
+share/opencpn/doc/50info/odg1.jpg
+share/opencpn/doc/50info/odg3.jpg
+share/opencpn/doc/50info/perslay1.jpg
+share/opencpn/doc/50info/perslay2.jpg
+share/opencpn/doc/50info/prepvc.jpg
+share/opencpn/doc/50info/routeall.jpg
+share/opencpn/doc/50info/routes-points.jpg
+share/opencpn/doc/50info/rteprop.jpg
+share/opencpn/doc/50info/rteptprop.jpg
+share/opencpn/doc/50info/wptprop.jpg
 share/opencpn/doc/advanced_features.html
 share/opencpn/doc/advanced_features/advanced_features.html
 share/opencpn/doc/advanced_features/anchor_watch.html
@@ -1122,10 +1167,12 @@ share/opencpn/doc/toolbar_buttons/ship_t
 share/opencpn/doc/toolbar_buttons/tides_and_currents.html
 share/opencpn/doc/toolbar_buttons/vector_text_display.html
 share/opencpn/doc/toolbar_buttons/zooming.html
+share/opencpn/doc/ver500.html
 share/opencpn/gshhs/poly-c-1.dat
 share/opencpn/gshhs/wdb_borders_c.b
 share/opencpn/gshhs/wdb_rivers_c.b
-share/opencpn/license.txt
+share/opencpn/license.html
+share/opencpn/opencpn.png
 share/opencpn/plugins/chartdldr_pi/data/chart_sources.xml
 share/opencpn/plugins/chartdldr_pi/data/doc/03-Chart-Downloader-Tab-First-Time.png
 share/opencpn/plugins/chartdldr_pi/data/doc/04-AddNewChartSource-Predefined.png
@@ -1149,6 +1196,7 @@ share/opencpn/plugins/dashboard_pi/data/
 share/opencpn/plugins/grib_pi/data/altitude.svg
 share/opencpn/plugins/grib_pi/data/curdata.svg
 share/opencpn/plugins/grib_pi/data/grib.svg
+share/opencpn/plugins/grib_pi/data/grib_panel_icon.png
 share/opencpn/plugins/grib_pi/data/grib_rollover.svg
 share/opencpn/plugins/grib_pi/data/grib_toggled.svg
 share/opencpn/plugins/grib_pi/data/ncurdata.svg
@@ -1183,6 +1231,54 @@ share/opencpn/tcdata/HARMONIC
 share/opencpn/tcdata/HARMONIC.IDX
 share/opencpn/tcdata/README.harmonics
 share/opencpn/uidata/DragHandle.svg
+share/opencpn/uidata/MUI_flat/CompassRose.svg
+share/opencpn/uidata/MUI_flat/CompassRoseBlue.svg
+share/opencpn/uidata/MUI_flat/Dashboard.svg
+share/opencpn/uidata/MUI_flat/Dashboard_rollover.svg
+share/opencpn/uidata/MUI_flat/Dashboard_rollover_toggled.svg
+share/opencpn/uidata/MUI_flat/Dashboard_toggled.svg
+share/opencpn/uidata/MUI_flat/GRIB.svg
+share/opencpn/uidata/MUI_flat/GRIB_rollover.svg
+share/opencpn/uidata/MUI_flat/GRIB_rollover_toggled.svg
+share/opencpn/uidata/MUI_flat/GRIB_toggled.svg
+share/opencpn/uidata/MUI_flat/MUI_RMD.svg
+share/opencpn/uidata/MUI_flat/MUI_Sconfig_1.svg
+share/opencpn/uidata/MUI_flat/MUI_Sconfig_2.svg
+share/opencpn/uidata/MUI_flat/MUI_colorscheme.svg
+share/opencpn/uidata/MUI_flat/MUI_follow.svg
+share/opencpn/uidata/MUI_flat/MUI_follow_active.svg
+share/opencpn/uidata/MUI_flat/MUI_follow_ahead.svg
+share/opencpn/uidata/MUI_flat/MUI_help.svg
+share/opencpn/uidata/MUI_flat/MUI_menu.svg
+share/opencpn/uidata/MUI_flat/MUI_menu_rollover.svg
+share/opencpn/uidata/MUI_flat/MUI_print.svg
+share/opencpn/uidata/MUI_flat/MUI_route.svg
+share/opencpn/uidata/MUI_flat/MUI_route_rollover_toggled.svg
+share/opencpn/uidata/MUI_flat/MUI_route_toggled.svg
+share/opencpn/uidata/MUI_flat/MUI_settings.svg
+share/opencpn/uidata/MUI_flat/MUI_settings_disabled.svg
+share/opencpn/uidata/MUI_flat/MUI_track.svg
+share/opencpn/uidata/MUI_flat/MUI_track_rollover.svg
+share/opencpn/uidata/MUI_flat/MUI_track_rollover_toggled.svg
+share/opencpn/uidata/MUI_flat/MUI_track_toggled.svg
+share/opencpn/uidata/MUI_flat/MUI_zoom-in.svg
+share/opencpn/uidata/MUI_flat/MUI_zoom-out.svg
+share/opencpn/uidata/MUI_flat/WMM.svg
+share/opencpn/uidata/MUI_flat/gps1Bar.svg
+share/opencpn/uidata/MUI_flat/gps2Bar.svg
+share/opencpn/uidata/MUI_flat/gps3Bar.svg
+share/opencpn/uidata/MUI_flat/gpsGrn.svg
+share/opencpn/uidata/MUI_flat/gpsGry.svg
+share/opencpn/uidata/MUI_flat/gpsRed.svg
+share/opencpn/uidata/MUI_flat/mob_btn.svg
+share/opencpn/uidata/eye.svg
+share/opencpn/uidata/eyex.svg
+share/opencpn/uidata/iENC_All.svg
+share/opencpn/uidata/iENC_Minimum.svg
+share/opencpn/uidata/iENC_RMinus.svg
+share/opencpn/uidata/iENC_RPlus.svg
+share/opencpn/uidata/iENC_Standard.svg
+share/opencpn/uidata/iENC_UserStd.svg
 share/opencpn/uidata/iconAll.png
 share/opencpn/uidata/iconMinimum.png
 share/opencpn/uidata/iconRMinus.png
@@ -1224,6 +1320,7 @@ share/opencpn/uidata/markicons/Authority
 share/opencpn/uidata/markicons/Authority-Quarantine-Area.svg
 share/opencpn/uidata/markicons/Authority-Quarantine-Building.svg
 share/opencpn/uidata/markicons/Authority-Quarantine-Flag.svg
+share/opencpn/uidata/markicons/DragHandle.svg
 share/opencpn/uidata/markicons/Hazard-Airplane.svg
 share/opencpn/uidata/markicons/Hazard-Animals-Crocodile.svg
 share/opencpn/uidata/markicons/Hazard-Animals-Jellyfish.svg
@@ -1285,6 +1382,8 @@ share/opencpn/uidata/markicons/Marks-Buo
 share/opencpn/uidata/markicons/Marks-Buoy-TypeB.svg
 share/opencpn/uidata/markicons/Marks-Cardinal-East-Lighted.svg
 share/opencpn/uidata/markicons/Marks-Cardinal-East.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-Nord-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Cardinal-Nord.svg
 share/opencpn/uidata/markicons/Marks-Cardinal-North-Lighted.svg
 share/opencpn/uidata/markicons/Marks-Cardinal-North.svg
 share/opencpn/uidata/markicons/Marks-Cardinal-South-Lighted.svg
@@ -1313,6 +1412,8 @@ share/opencpn/uidata/markicons/Marks-Moo
 share/opencpn/uidata/markicons/Marks-Mooring-Buoy.svg
 share/opencpn/uidata/markicons/Marks-Mooring-Float.svg
 share/opencpn/uidata/markicons/Marks-Mooring-Pile.svg
+share/opencpn/uidata/markicons/Marks-New-Danger-Lighted.svg
+share/opencpn/uidata/markicons/Marks-New-Danger.svg
 share/opencpn/uidata/markicons/Marks-Race-Committee-Start-Boat.svg
 share/opencpn/uidata/markicons/Marks-Race-Finish.svg
 share/opencpn/uidata/markicons/Marks-Race-Start.svg
@@ -1321,6 +1422,8 @@ share/opencpn/uidata/markicons/Marks-Rac
 share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark3.svg
 share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark4.svg
 share/opencpn/uidata/markicons/Marks-Race-Tetrahedron-Mark5.svg
+share/opencpn/uidata/markicons/Marks-Safe-Water-Lighted.svg
+share/opencpn/uidata/markicons/Marks-Safe-Water.svg
 share/opencpn/uidata/markicons/Sea-Current-Eastbound.svg
 share/opencpn/uidata/markicons/Sea-Current-N-Eastbound.svg
 share/opencpn/uidata/markicons/Sea-Current-N-Westbound.svg

Index: pkgsrc/geography/opencpn/distinfo
diff -u pkgsrc/geography/opencpn/distinfo:1.23 pkgsrc/geography/opencpn/distinfo:1.24
--- pkgsrc/geography/opencpn/distinfo:1.23      Sun Nov 25 17:04:40 2018
+++ pkgsrc/geography/opencpn/distinfo   Mon Mar 25 11:34:05 2019
@@ -1,23 +1,18 @@
-$NetBSD: distinfo,v 1.23 2018/11/25 17:04:40 bouyer Exp $
+$NetBSD: distinfo,v 1.24 2019/03/25 11:34:05 bouyer Exp $
 
-SHA1 (OpenCPN-4.8.8.zip) = 96181b5785988b97d4fcfc851408652e1322aa59
-RMD160 (OpenCPN-4.8.8.zip) = fbb22e01f212943d4581cbf18bcab674fdb9786f
-SHA512 (OpenCPN-4.8.8.zip) = 7f3973c7f488c7a1924f4e4a20b626fdeb174a0b04d7f4c2fe4936022863c1aa00eec06477507a00bdcb654759c42f084d27afafeee318cfc2611ff2c83faef1
-Size (OpenCPN-4.8.8.zip) = 61811803 bytes
-SHA1 (patch-CMakeLists.txt) = f910ed2ba317070ec536fd1ee1230364964755da
-SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
-SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
-SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
-SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e
-SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
+SHA1 (OpenCPN-5.0.0.zip) = e4f2c77001fafed835c2329a1f2a74afdd4858ca
+RMD160 (OpenCPN-5.0.0.zip) = e8ee55b1b00017f2fc885c147e8f69ec13c627aa
+SHA512 (OpenCPN-5.0.0.zip) = 146fe0bf29424f72138168cd20617aabc2f130d2ffd47b8da4aa1e0aa6d7176093b36d96d8f0d456af1f7805db13ed87be67f4f3af7a7a2d6abf0d5734834f7a
+Size (OpenCPN-5.0.0.zip) = 70056870 bytes
+SHA1 (patch-CMakeLists.txt) = 2a615ec6c11621e7b119f75d5db2b06f7f2a7221
+SHA1 (patch-FindPortaudio.cmake) = d13b7e6cf42ea5b837ea6230c16b4558e87aa16c
+SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = e193798a04082c3a20264214e2a3aa951f0ee514
+SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 5523e8bb960306a15367a7c9a8385f3787a2baf4
+SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 75338d3a85666eed26157e17d693f937b0356689
 SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
-SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
-SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = 885f940777b38c8e59cc5d2e4fdbd1bf9a91578d
-SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
-SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
 SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
 SHA1 (patch-src_ocpndc.cpp) = 4a72093a49f29d66a42e3f64b99a1a40bf08a658
 SHA1 (patch-src_printtable.cpp) = 52ed0f09610d56e9acc5ec9b8e4cbdc7ad55d043
 SHA1 (patch-src_routeprintout.cpp) = c0f960b76b1b7a8acb7e5faca5f656a5c259f02c
-SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040
+SHA1 (patch-src_wxcurl_base.cpp) = 25c6d03dd1215885f15221d888327f0535080284

Index: pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.8 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.9
--- pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.8   Sun Nov 25 17:04:40 2018
+++ pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt       Mon Mar 25 11:34:05 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.8 2018/11/25 17:04:40 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.9 2019/03/25 11:34:05 bouyer Exp $
 
---- CMakeLists.txt.orig        2018-11-07 04:14:41.000000000 +0100
-+++ CMakeLists.txt     2018-11-25 14:47:14.684811535 +0100
-@@ -91,8 +91,21 @@
+--- CMakeLists.txt.orig        2019-03-13 05:01:43.000000000 +0100
++++ CMakeLists.txt     2019-03-13 12:59:52.443556322 +0100
+@@ -157,7 +157,19 @@
  # Based on code from nohal
  IF (NOT WIN32)
    # default
@@ -21,11 +21,9 @@ $NetBSD: patch-CMakeLists.txt,v 1.8 2018
 +    ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
 +  ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
    SET (LIB_INSTALL_DIR "lib")
-+
    IF (EXISTS /etc/debian_version)
      SET (PACKAGE_FORMAT "DEB")
-     SET (PACKAGE_DEPS "libc6, libwxgtk3.0-0, wx3.0-i18n, libglu1-mesa (>= 7.0.0), libgl1-mesa-glx (>= 7.0.0), zlib1g, bzip2, libtinyxml2.6.2, libportaudio2")
-@@ -125,7 +138,6 @@
+@@ -191,7 +203,6 @@
      ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
        IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
          SET (ARCH "x86_64")
@@ -33,35 +31,19 @@ $NetBSD: patch-CMakeLists.txt,v 1.8 2018
        ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
          SET (ARCH "i386")
          SET (LIB_INSTALL_DIR "lib")
-@@ -344,7 +356,7 @@
+@@ -1033,7 +1044,6 @@
  
- # Search for opengles, short of running a program to test the speed
- # of acceleration, I simply use gles on "native linux" arm systems
--IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) )
-+IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" )
-   find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
-   IF (OPENGLESv1_INCLUDE_DIR)
-     MESSAGE (STATUS "Found OpenGLESv1")
-@@ -927,7 +939,6 @@
  
-  
  IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
 -  OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF)
  
-   IF(NOT OCPN_FORCE_GTK3)
-     FIND_PACKAGE(GTK2)
-@@ -1978,10 +1989,10 @@
  
- #   Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries
+   IF(NOT OCPN_FORCE_GTK3)
+@@ -2336,6 +2346,7 @@
  #   So, add them manually.  These declarations may be redundant in some architectures, but do no harm.
--IF(UNIX)
--TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
--ENDIF(UNIX)
--
-+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
-+  TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
+ IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+   TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
 +  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
-+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+ 
  
- IF( UNIX AND NOT APPLE )
-     FIND_PATH( LIBELF_INCLUDE_DIR NAMES libelf.h gelf.h PATH_SUFFIXES libelf )

Index: pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake
diff -u pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake:1.2 pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake:1.3
--- pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake:1.2      Thu Jan 22 12:34:15 2015
+++ pkgsrc/geography/opencpn/patches/patch-FindPortaudio.cmake  Mon Mar 25 11:34:05 2019
@@ -1,9 +1,9 @@
-$NetBSD: patch-FindPortaudio.cmake,v 1.2 2015/01/22 12:34:15 bouyer Exp $
+$NetBSD: patch-FindPortaudio.cmake,v 1.3 2019/03/25 11:34:05 bouyer Exp $
 
 really find portaudio in portaudio2 subdir
 
---- FindPortaudio.cmake.orig   2014-05-26 21:26:36.000000000 +0200
-+++ FindPortaudio.cmake        2014-05-26 21:30:22.000000000 +0200
+--- cmake/FindPortaudio.cmake.orig     2014-05-26 21:26:36.000000000 +0200
++++ cmake/FindPortaudio.cmake  2014-05-26 21:30:22.000000000 +0200
 @@ -45,24 +45,13 @@
  set(PORTAUDIO_FOUND TRUE)
  else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
Index: pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt:1.2 pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt:1.3
--- pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt:1.2      Sat May 21 10:50:41 2016
+++ pkgsrc/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt  Mon Mar 25 11:34:05 2019
@@ -1,19 +1,8 @@
-$NetBSD: patch-plugins_dashboard_pi_CMakeLists.txt,v 1.2 2016/05/21 10:50:41 bouyer Exp $
+$NetBSD: patch-plugins_dashboard_pi_CMakeLists.txt,v 1.3 2019/03/25 11:34:05 bouyer Exp $
 
---- plugins/dashboard_pi/CMakeLists.txt.orig   2016-02-03 18:44:17.000000000 +0100
-+++ plugins/dashboard_pi/CMakeLists.txt        2016-05-21 11:08:40.892255884 +0200
-@@ -45,7 +45,9 @@
- #  IF NOT DEBUGGING CFLAGS="-O2 -march=native"
- IF(NOT WIN32 AND NOT APPLE)
-     ADD_DEFINITIONS( "-Wall -O2 -fexceptions -fvisibility=hidden" )
--    SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
-+    IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
-+     SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
-+    ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
- ENDIF(NOT WIN32 AND NOT APPLE)
- 
- IF( APPLE )
-@@ -263,5 +265,8 @@
+--- plugins/dashboard_pi/CMakeLists.txt.orig   2019-02-22 04:55:10.000000000 +0100
++++ plugins/dashboard_pi/CMakeLists.txt        2019-02-22 14:34:10.074874697 +0100
+@@ -266,5 +268,8 @@
      ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/data)
  ENDIF(WIN32)
  
Index: pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt:1.2 pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt:1.3
--- pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt:1.2   Sat May 21 10:50:41 2016
+++ pkgsrc/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt       Mon Mar 25 11:34:05 2019
@@ -1,21 +1,8 @@
-$NetBSD: patch-plugins_grib_pi_CMakeLists.txt,v 1.2 2016/05/21 10:50:41 bouyer Exp $
+$NetBSD: patch-plugins_grib_pi_CMakeLists.txt,v 1.3 2019/03/25 11:34:05 bouyer Exp $
 
---- plugins/grib_pi/CMakeLists.txt.orig        2016-02-03 18:44:17.000000000 +0100
-+++ plugins/grib_pi/CMakeLists.txt     2016-05-21 11:08:48.884522634 +0200
-@@ -42,9 +42,11 @@
- #ADD_DEFINITIONS( "-Wall -ansi -pedantic -Wno-variadic-macros" )
- #TODO: Should we use  -fno-stack-protector
- #  IF NOT DEBUGGING CFLAGS="-O2 -march=native"
-+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
-+ SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
-+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
- IF(NOT WIN32 AND NOT APPLE)
-     ADD_DEFINITIONS( "-Wall -fexceptions -fvisibility=hidden" )
--    SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
- ENDIF(NOT WIN32 AND NOT APPLE)
- 
- IF( APPLE )
-@@ -258,5 +260,8 @@
+--- plugins/grib_pi/CMakeLists.txt.orig        2019-02-22 04:55:10.000000000 +0100
++++ plugins/grib_pi/CMakeLists.txt     2019-02-22 14:35:35.500028250 +0100
+@@ -283,5 +285,8 @@
  
  ENDIF(WIN32)
  

Index: pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt:1.1 pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt:1.2
--- pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt:1.1      Sat May 21 10:50:41 2016
+++ pkgsrc/geography/opencpn/patches/patch-plugins_chartdldr_pi_CMakeLists.txt  Mon Mar 25 11:34:05 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-plugins_chartdldr_pi_CMakeLists.txt,v 1.1 2016/05/21 10:50:41 bouyer Exp $
+$NetBSD: patch-plugins_chartdldr_pi_CMakeLists.txt,v 1.2 2019/03/25 11:34:05 bouyer Exp $
 
---- plugins/chartdldr_pi/CMakeLists.txt.orig   2016-05-21 11:06:35.652268145 +0200
-+++ plugins/chartdldr_pi/CMakeLists.txt        2016-05-21 11:08:36.585112791 +0200
-@@ -130,6 +130,9 @@
+--- plugins/chartdldr_pi/CMakeLists.txt.orig   2019-02-22 04:55:10.000000000 +0100
++++ plugins/chartdldr_pi/CMakeLists.txt        2019-02-22 14:32:36.748813048 +0100
+@@ -185,6 +185,9 @@
+   TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} "-lz" )
  ENDIF(QT_ANDROID)
  
- 
 +IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
 +   SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
 +ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")

Prev by Date: CVS commit: pkgsrc/devel/ocaml-async
Next by Date: CVS commit: pkgsrc/geography/opencpn-plugin-draw
Previous by Thread: CVS commit: pkgsrc/devel/ocaml-async
Next by Thread: CVS commit: pkgsrc/geography/opencpn-plugin-draw
Indexes:

Home | Main Index | Thread Index | Old Index