pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/geography
Module Name: pkgsrc
Committed By: bouyer
Date: Thu Jul 19 17:58:58 UTC 2018
Modified Files:
pkgsrc/geography/opencpn: Makefile distinfo
pkgsrc/geography/opencpn-plugin-debugger: Makefile
pkgsrc/geography/opencpn-plugin-draw: Makefile
pkgsrc/geography/opencpn-plugin-statusbar: Makefile
pkgsrc/geography/opencpn-plugin-watchdog: Makefile
pkgsrc/geography/opencpn-plugin-weather_routing: Makefile
pkgsrc/geography/opencpn/patches: patch-CMakeLists.txt
Log Message:
Do not include buildlink3 files already inclued by wxGTK30/buildlink3.mk
(especially, remove gtk2 buildlink3).
Make opencpn build with gtk3
Conservatively bump PKGREVISIONs
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/geography/opencpn/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/geography/opencpn/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/opencpn-plugin-debugger/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/geography/opencpn-plugin-draw/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/opencpn-plugin-statusbar/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/opencpn-plugin-watchdog/Makefile
cvs rdiff -u -r1.17 -r1.18 \
pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
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.23 pkgsrc/geography/opencpn/Makefile:1.24
--- pkgsrc/geography/opencpn/Makefile:1.23 Sun Apr 29 21:31:42 2018
+++ pkgsrc/geography/opencpn/Makefile Thu Jul 19 17:58:57 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2018/04/29 21:31:42 adam Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/19 17:58:57 bouyer Exp $
DISTNAME= OpenCPN-4.8.2
-PKGREVISION= 4
+PKGREVISION= 5
PKGNAME= ${DISTNAME:S/OpenCPN/opencpn/}
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/}
@@ -14,9 +14,9 @@ HOMEPAGE= http://www.opencpn.org/
COMMENT= Concise ChartPlotter/Navigator
LICENSE= gnu-gpl-v2
-USE_LANGUAGES= c c++
-USE_TOOLS= gettext
-USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= gettext pkg-config
+USE_CMAKE= yes
CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
CMAKE_ARGS+= -DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON
@@ -41,10 +41,7 @@ SUBST_SED.prefix= -e s,"/usr/local,"${PR
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../audio/portaudio-devel/buildlink3.mk"
Index: pkgsrc/geography/opencpn/distinfo
diff -u pkgsrc/geography/opencpn/distinfo:1.19 pkgsrc/geography/opencpn/distinfo:1.20
--- pkgsrc/geography/opencpn/distinfo:1.19 Tue Jul 3 15:14:15 2018
+++ pkgsrc/geography/opencpn/distinfo Thu Jul 19 17:58:57 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2018/07/03 15:14:15 bouyer Exp $
+$NetBSD: distinfo,v 1.20 2018/07/19 17:58:57 bouyer Exp $
SHA1 (OpenCPN-4.8.2.zip) = 9547a99c0de739fb0f4953d37bb738ed651f5c62
RMD160 (OpenCPN-4.8.2.zip) = f217d07cc639292e657b0f89f96daa12cab2a355
SHA512 (OpenCPN-4.8.2.zip) = 53635bcb77d96171afecdbf6bb987256016dce9019eca6c644500e14b820ed0843be6cdc3c0567b537eb1a65dbee4cfcaa73fa13361d6deb1ed0aa585d0e6cba
Size (OpenCPN-4.8.2.zip) = 61827184 bytes
-SHA1 (patch-CMakeLists.txt) = c20b25c64790f5a595a5ef2940f430e588ffdf14
+SHA1 (patch-CMakeLists.txt) = 6d11df2c83e445050c91e23ec6657798726b4338
SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932b923df6ff7541dad37e14d65
Index: pkgsrc/geography/opencpn-plugin-debugger/Makefile
diff -u pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.10 pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.11
--- pkgsrc/geography/opencpn-plugin-debugger/Makefile:1.10 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-debugger/Makefile Thu Jul 19 17:58:58 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/19 17:58:58 bouyer Exp $
#
VERSION= 20170414
-PKGREVISION= 5
+PKGREVISION= 6
DISTNAME= ocpndebugger_pi-${VERSION}
PKGNAME= opencpn-plugin-debugger-${VERSION}
CATEGORIES= geography
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-draw/Makefile
diff -u pkgsrc/geography/opencpn-plugin-draw/Makefile:1.16 pkgsrc/geography/opencpn-plugin-draw/Makefile:1.17
--- pkgsrc/geography/opencpn-plugin-draw/Makefile:1.16 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-draw/Makefile Thu Jul 19 17:58:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/07/19 17:58:58 bouyer Exp $
#
VERSION= 1.5_20180405
DISTNAME= ocpn_draw_pi-${VERSION}
PKGNAME= opencpn-plugin-draw-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=jongough/}
GITHUB_PROJECT= ocpn_draw_pi
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-statusbar/Makefile
diff -u pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.7 pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.8
--- pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.7 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-statusbar/Makefile Thu Jul 19 17:58:58 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/19 17:58:58 bouyer Exp $
VERSION= 20180405
-PKGREVISION= 3
+PKGREVISION= 4
DISTNAME= statusbar_pi-${VERSION}
PKGNAME= opencpn-plugin-statusbar-${VERSION}
CATEGORIES= geography
@@ -25,9 +25,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-watchdog/Makefile
diff -u pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.14 pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.15
--- pkgsrc/geography/opencpn-plugin-watchdog/Makefile:1.14 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-watchdog/Makefile Thu Jul 19 17:58:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/19 17:58:58 bouyer Exp $
#
VERSION= 20180405
DISTNAME= watchdog_pi-${VERSION}
PKGNAME= opencpn-plugin-watchdog-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= watchdog_pi
@@ -26,9 +26,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.17 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.18
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.17 Sun Apr 29 05:46:37 2018
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile Thu Jul 19 17:58:58 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2018/04/29 05:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/19 17:58:58 bouyer Exp $
#
VERSION= 20180405
DISTNAME= weather_routing_pi-${VERSION}
PKGNAME= opencpn-plugin-weather_routing-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
GITHUB_PROJECT= weather_routing_pi
@@ -27,9 +27,6 @@ CMAKE_MODULE_PATH_OVERRIDE = \
cmake/PluginPackage.cmake
.include "../../devel/cmake/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/wxGTK30/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt
diff -u pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.6 pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt:1.6 Tue Apr 18 13:31:55 2017
+++ pkgsrc/geography/opencpn/patches/patch-CMakeLists.txt Thu Jul 19 17:58:57 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2017/04/18 13:31:55 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2018/07/19 17:58:57 bouyer Exp $
---- CMakeLists.txt.orig 2017-04-02 05:17:09.000000000 +0200
-+++ CMakeLists.txt 2017-04-18 15:03:46.000000000 +0200
-@@ -65,8 +65,21 @@
+--- CMakeLists.txt.orig 2018-02-07 12:08:26.000000000 +0100
++++ CMakeLists.txt 2018-07-19 17:20:24.093239101 +0200
+@@ -91,8 +91,21 @@
# Based on code from nohal
IF (NOT WIN32)
# default
@@ -25,7 +25,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
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")
-@@ -99,7 +112,6 @@
+@@ -125,7 +138,6 @@
ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET (ARCH "x86_64")
@@ -33,7 +33,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET (ARCH "i386")
SET (LIB_INSTALL_DIR "lib")
-@@ -318,7 +330,7 @@
+@@ -344,7 +356,7 @@
# Search for opengles, short of running a program to test the speed
# of acceleration, I simply use gles on "native linux" arm systems
@@ -42,7 +42,20 @@ $NetBSD: patch-CMakeLists.txt,v 1.6 2017
find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
IF (OPENGLESv1_INCLUDE_DIR)
MESSAGE (STATUS "Found OpenGLESv1")
-@@ -1861,10 +1873,10 @@
+@@ -868,7 +880,11 @@
+
+
+ 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 @@
# 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.
Home |
Main Index |
Thread Index |
Old Index