Sun Nov 25 17:04:40 2018 UTC ()
Do not force the gtk version, let cmake find the right one from buildlink.
No change to binaries so no revision bump.


(bouyer)
diff -r1.22 -r1.23 pkgsrc/geography/opencpn/distinfo
diff -r1.7 -r1.8 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
cvs diff -r1.22 -r1.23 pkgsrc/geography/opencpn/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/distinfo 2018/11/15 12:23:01 1.22
+++ pkgsrc/geography/opencpn/distinfo 2018/11/25 17:04:40 1.23
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.22 2018/11/15 12:23:01 bouyer Exp $ 1$NetBSD: distinfo,v 1.23 2018/11/25 17:04:40 bouyer Exp $
2 2
3SHA1 (OpenCPN-4.8.8.zip) = 96181b5785988b97d4fcfc851408652e1322aa59 3SHA1 (OpenCPN-4.8.8.zip) = 96181b5785988b97d4fcfc851408652e1322aa59
4RMD160 (OpenCPN-4.8.8.zip) = fbb22e01f212943d4581cbf18bcab674fdb9786f 4RMD160 (OpenCPN-4.8.8.zip) = fbb22e01f212943d4581cbf18bcab674fdb9786f
5SHA512 (OpenCPN-4.8.8.zip) = 7f3973c7f488c7a1924f4e4a20b626fdeb174a0b04d7f4c2fe4936022863c1aa00eec06477507a00bdcb654759c42f084d27afafeee318cfc2611ff2c83faef1 5SHA512 (OpenCPN-4.8.8.zip) = 7f3973c7f488c7a1924f4e4a20b626fdeb174a0b04d7f4c2fe4936022863c1aa00eec06477507a00bdcb654759c42f084d27afafeee318cfc2611ff2c83faef1
6Size (OpenCPN-4.8.8.zip) = 61811803 bytes 6Size (OpenCPN-4.8.8.zip) = 61811803 bytes
7SHA1 (patch-CMakeLists.txt) = 6d11df2c83e445050c91e23ec6657798726b4338 7SHA1 (patch-CMakeLists.txt) = f910ed2ba317070ec536fd1ee1230364964755da
8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a 8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85 9SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65 10SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e 11SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e
12SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49 12SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
13SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046 13SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
14SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a 14SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
15SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = 885f940777b38c8e59cc5d2e4fdbd1bf9a91578d 15SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = 885f940777b38c8e59cc5d2e4fdbd1bf9a91578d
16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 16SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 17SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62 18SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb 19SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
20SHA1 (patch-src_ocpndc.cpp) = 4a72093a49f29d66a42e3f64b99a1a40bf08a658 20SHA1 (patch-src_ocpndc.cpp) = 4a72093a49f29d66a42e3f64b99a1a40bf08a658
cvs diff -r1.7 -r1.8 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt 2018/07/19 17:58:57 1.7
+++ pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt 2018/11/25 17:04:40 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-CMakeLists.txt,v 1.7 2018/07/19 17:58:57 bouyer Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.8 2018/11/25 17:04:40 bouyer Exp $
2 2
3--- CMakeLists.txt.orig 2018-02-07 12:08:26.000000000 +0100 3--- CMakeLists.txt.orig 2018-11-07 04:14:41.000000000 +0100
4+++ CMakeLists.txt 2018-07-19 17:20:24.093239101 +0200 4+++ CMakeLists.txt 2018-11-25 14:47:14.684811535 +0100
5@@ -91,8 +91,21 @@ 5@@ -91,8 +91,21 @@
6 # Based on code from nohal 6 # Based on code from nohal
7 IF (NOT WIN32) 7 IF (NOT WIN32)
8 # default 8 # default
9- SET (ARCH "i386") 9- SET (ARCH "i386")
10+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") 10+ IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
11+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") 11+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
12+ SET (ARCH "aarch64") 12+ SET (ARCH "aarch64")
13+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") 13+ ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
14+ SET (ARCH "armhf") 14+ SET (ARCH "armhf")
15+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") 15+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
16+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") 16+ ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
17+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") 17+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
@@ -32,40 +32,35 @@ $NetBSD: patch-CMakeLists.txt,v 1.7 2018 @@ -32,40 +32,35 @@ $NetBSD: patch-CMakeLists.txt,v 1.7 2018
32- SET (LIB_INSTALL_DIR "lib64") 32- SET (LIB_INSTALL_DIR "lib64")
33 ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") 33 ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
34 SET (ARCH "i386") 34 SET (ARCH "i386")
35 SET (LIB_INSTALL_DIR "lib") 35 SET (LIB_INSTALL_DIR "lib")
36@@ -344,7 +356,7 @@ 36@@ -344,7 +356,7 @@
37  37
38 # Search for opengles, short of running a program to test the speed 38 # Search for opengles, short of running a program to test the speed
39 # of acceleration, I simply use gles on "native linux" arm systems 39 # of acceleration, I simply use gles on "native linux" arm systems
40-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) ) 40-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) )
41+IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" ) 41+IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" )
42 find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h ) 42 find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
43 IF (OPENGLESv1_INCLUDE_DIR) 43 IF (OPENGLESv1_INCLUDE_DIR)
44 MESSAGE (STATUS "Found OpenGLESv1") 44 MESSAGE (STATUS "Found OpenGLESv1")
45@@ -868,7 +880,11 @@ 45@@ -927,7 +939,6 @@
46  46
47  47
48 IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID) 48 IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
49- OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF) 49- OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF)
50+ IF(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD") 
51+ OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" ON) 
52+ ELSE(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD") 
53+ OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF) 
54+ ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD") 
55  50
56 IF(NOT OCPN_FORCE_GTK3) 51 IF(NOT OCPN_FORCE_GTK3)
57 FIND_PACKAGE(GTK2) 52 FIND_PACKAGE(GTK2)
58@@ -1919,10 +1935,10 @@ 53@@ -1978,10 +1989,10 @@
59  54
60 # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries 55 # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries
61 # So, add them manually. These declarations may be redundant in some architectures, but do no harm. 56 # So, add them manually. These declarations may be redundant in some architectures, but do no harm.
62-IF(UNIX) 57-IF(UNIX)
63-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) 58-TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
64-ENDIF(UNIX) 59-ENDIF(UNIX)
65- 60-
66+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") 61+IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
67+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) 62+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
68+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic") 63+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic")
69+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") 64+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
70  65
71 IF( UNIX AND NOT APPLE ) 66 IF( UNIX AND NOT APPLE )