[pkgsrc/trunk]: pkgsrc/geography/opencpn Do not force the gtk version, let cm...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ec28b2eaecc
branches:  trunk
changeset: 387789:4ec28b2eaecc
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Sun Nov 25 17:04:40 2018 +0000

description:
Do not force the gtk version, let cmake find the right one from buildlink.
No change to binaries so no revision bump.

diffstat:

 geography/opencpn/distinfo                     |   4 ++--
 geography/opencpn/patches/patch-CMakeLists.txt |  15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 03b013f5c806 -r 4ec28b2eaecc geography/opencpn/distinfo
--- a/geography/opencpn/distinfo        Sun Nov 25 17:03:42 2018 +0000
+++ b/geography/opencpn/distinfo        Sun Nov 25 17:04:40 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2018/11/15 12:23:01 bouyer Exp $
+$NetBSD: distinfo,v 1.23 2018/11/25 17:04:40 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) = 6d11df2c83e445050c91e23ec6657798726b4338
+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
diff -r 03b013f5c806 -r 4ec28b2eaecc geography/opencpn/patches/patch-CMakeLists.txt
--- a/geography/opencpn/patches/patch-CMakeLists.txt    Sun Nov 25 17:03:42 2018 +0000
+++ b/geography/opencpn/patches/patch-CMakeLists.txt    Sun Nov 25 17:04:40 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2018/07/19 17:58:57 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2018/11/25 17:04:40 bouyer Exp $
 
---- CMakeLists.txt.orig        2018-02-07 12:08:26.000000000 +0100
-+++ CMakeLists.txt     2018-07-19 17:20:24.093239101 +0200
+--- 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 @@
  # Based on code from nohal
  IF (NOT WIN32)
@@ -42,20 +42,15 @@
    find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
    IF (OPENGLESv1_INCLUDE_DIR)
      MESSAGE (STATUS "Found OpenGLESv1")
-@@ -868,7 +880,11 @@
+@@ -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(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
-+    OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" ON)
-+  ELSE(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
-+    OPTION(OCPN_FORCE_GTK3 "Force the build to use GTK3" OFF)
-+  ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*NetBSD")
  
    IF(NOT OCPN_FORCE_GTK3)
      FIND_PACKAGE(GTK2)
-@@ -1919,10 +1935,10 @@
+@@ -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
  #   So, add them manually.  These declarations may be redundant in some architectures, but do no harm.