From 2da411a828bf5efa57d19a5c6b7a573cf005f661 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer>
Date: Sat, 21 May 2016 10:50:41 +0000
Subject: Make theses build (and run) on linux

---
 geography/opencpn-plugin-draw/distinfo               |  5 +++--
 .../patches/patch-cmake_PluginConfigure.cmake        | 10 +++++++---
 .../patches/patch-cmake_PluginInstall.cmake          | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake

(limited to 'geography/opencpn-plugin-draw')

diff --git a/geography/opencpn-plugin-draw/distinfo b/geography/opencpn-plugin-draw/distinfo
index c97d756c126..9bf0d783fc1 100644
--- a/geography/opencpn-plugin-draw/distinfo
+++ b/geography/opencpn-plugin-draw/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2016/04/24 10:21:54 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2016/05/21 10:50:41 bouyer Exp $
 
 SHA1 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = a1e06d6c810ad8e02a1f8f35677517e18adc28f6
 RMD160 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 60c84b16d04a2e10a189a7c72e14b4f1405c9686
 SHA512 (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 639392c7c219cafcbcba88f04f9b75801c4f7e66a4c641fb28af79025333b9b57a16d37820a04cc353432f775e2fa3ee7d556d49f61c8d4741ba373998c27ee9
 Size (ocpn_draw_pi-20160415-047bb4c19c45e75f0bef3aba17ef7b52ef43d8af.tar.gz) = 1124238 bytes
-SHA1 (patch-cmake_PluginConfigure.cmake) = 15ee7241c1ef77bf5ac2da414d727a5e2f40b7a1
+SHA1 (patch-cmake_PluginConfigure.cmake) = 62dbbc6d13959fa313e6ea91ad6a28ee37da5fdd
+SHA1 (patch-cmake_PluginInstall.cmake) = 43a906b0a75a1e358ccd96992e1c14d526d07b4b
diff --git a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake
index 583b0e53c67..9a8920e40bc 100644
--- a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake
+++ b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginConfigure.cmake
@@ -1,15 +1,19 @@
-$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.1 2016/04/24 10:21:54 bouyer Exp $
+$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.2 2016/05/21 10:50:41 bouyer Exp $
 Do not overwrite CMAKE_SHARED_LINKER_FLAGS
 
 --- cmake/PluginConfigure.cmake.orig	2016-04-13 08:28:11.000000000 +0200
-+++ cmake/PluginConfigure.cmake	2016-04-15 16:03:44.000000000 +0200
-@@ -45,11 +45,9 @@
++++ cmake/PluginConfigure.cmake	2016-05-21 12:20:47.579936156 +0200
+@@ -45,11 +45,13 @@
  #  ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" )
   ENDIF(PROFILING)
  
 - IF(NOT APPLE)
 -  SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
 - ELSE(NOT APPLE)
++ IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
++   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
++   ADD_DEFINITIONS( "-fPIC")
++ ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
 + IF(APPLE)
    SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
 - ENDIF(NOT APPLE)
diff --git a/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake
new file mode 100644
index 00000000000..8a061efe7db
--- /dev/null
+++ b/geography/opencpn-plugin-draw/patches/patch-cmake_PluginInstall.cmake
@@ -0,0 +1,20 @@
+$NetBSD: patch-cmake_PluginInstall.cmake,v 1.1 2016/05/21 10:50:41 bouyer Exp $
+
+--- cmake/PluginInstall.cmake.orig	2016-04-13 08:28:11.000000000 +0200
++++ cmake/PluginInstall.cmake	2016-05-21 12:20:58.903393680 +0200
+@@ -85,7 +85,6 @@
+     #    SET (PACKAGE_DEPS  "wxGTK mesa-libGLU mesa-libGL gettext zlib bzip2 portaudio")
+     IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+       SET (ARCH "x86_64")
+-      SET (LIB_INSTALL_DIR "lib64")
+     ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+       SET (ARCH "i386")
+       SET (LIB_INSTALL_DIR "lib")
+@@ -96,7 +95,6 @@
+     #    SET (PACKAGE_DEPS  "libwx_baseu-2_8-0-wxcontainer MesaGLw libbz2-1 portaudio")
+     IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+       SET (ARCH "x86_64")
+-      SET (LIB_INSTALL_DIR "lib64")
+     ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
+       SET (ARCH "i386")
+       SET (LIB_INSTALL_DIR "lib")
-- 
cgit v1.2.3