CVS commit: pkgsrc/misc/xygrib

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Nov  4 18:53:14 UTC 2019

Modified Files:
        pkgsrc/misc/xygrib: Makefile distinfo
        pkgsrc/misc/xygrib/patches: patch-CMakeLists.txt

Log Message:
Forgot to add patch so that xygrib doesn't need x11/qt5-qtools.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/xygrib/Makefile \
    pkgsrc/misc/xygrib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/xygrib/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/misc/xygrib/Makefile
diff -u pkgsrc/misc/xygrib/Makefile:1.1 pkgsrc/misc/xygrib/Makefile:1.2
--- pkgsrc/misc/xygrib/Makefile:1.1     Mon Nov  4 18:35:21 2019
+++ pkgsrc/misc/xygrib/Makefile Mon Nov  4 18:53:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/11/04 18:35:21 nros Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/04 18:53:13 nros Exp $
 
 GITHUB_PROJECT=        XyGrib
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -26,5 +26,4 @@ USE_CMAKE=    yes
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/xygrib/distinfo
diff -u pkgsrc/misc/xygrib/distinfo:1.1 pkgsrc/misc/xygrib/distinfo:1.2
--- pkgsrc/misc/xygrib/distinfo:1.1     Mon Nov  4 18:35:21 2019
+++ pkgsrc/misc/xygrib/distinfo Mon Nov  4 18:53:13 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/11/04 18:35:21 nros Exp $
+$NetBSD: distinfo,v 1.2 2019/11/04 18:53:13 nros Exp $
 
 SHA1 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 8e3431ed6a5ef114d77ac57029129a26a381f696
 RMD160 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 876e8a53b492b2e2ea0572e5b0cd31a2c04f505a
@@ -12,4 +12,4 @@ SHA1 (XyGrib-1.1.1/XyGrib___cities_files
 RMD160 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 1c47e3af9884e1a927b1e717f938178f12a17fa8
 SHA512 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 6bb9362c87fec7633b0ad1fd3b8717408c0fffa36631db1d1a680928c724e8e49758c292cac164ad7a9773fd51a432d25628eecbaa1261f5f3c5ab6fc499fd01
 Size (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 2487518 bytes
-SHA1 (patch-CMakeLists.txt) = 011146a46621b1948a6d1bfae1605d769beff4df
+SHA1 (patch-CMakeLists.txt) = a206bc8c9f11a96a96a5e8aa001cc678189f4680

Index: pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt
diff -u pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.1 pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.1 Mon Nov  4 18:35:22 2019
+++ pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt     Mon Nov  4 18:53:13 2019
@@ -1,8 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/04 18:35:22 nros Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/04 18:53:13 nros Exp $
 
 * sanitze the names and dirs to search for libs and headers files
 * use PATH_SUFFIX fix to find openjpeg
 * install bins and data into the right directory
+* don't regenerate translations (no need for qttools dependecy)
 * don't install cmake files in the translation directory
 * install icon and desktop files
 * install hi-res maps
@@ -85,9 +86,20 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2019
       REQUIRED
   )
  include_directories(${OPENJPEG_INCLUDE_DIR})
-@@ -222,8 +174,9 @@ set(PREFIX_PKGDATA ".")
+@@ -212,22 +164,18 @@ include_directories(${PNG_INCLUDE_DIR})
+ configure_file(cmake/Version.h.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/Version.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include)
+ 
+-if(APPLE)
+-set(PREFIX_BIN ${PROJECT_NAME})
+-set(PREFIX_PKGDATA ${PROJECT_NAME})
+-endif()
+ if(WIN32)
+ set(PREFIX_BIN ".")
+ set(PREFIX_PKGDATA ".")
  endif()
- if(UNIX AND NOT APPLE)
+-if(UNIX AND NOT APPLE)
++if(UNIX)
  # This is not exactly a good idea on linux - the code should be changed so that the executable would go to /usr/local/bin and the data to /usr/local/share/XyGrib
 -set(PREFIX_BIN ${PROJECT_NAME})
 -set(PREFIX_PKGDATA ${PROJECT_NAME})
@@ -97,7 +109,11 @@ $NetBSD: patch-CMakeLists.txt,v 1.1 2019
  endif()
  
  add_subdirectory(src)
-@@ -241,4 +194,14 @@ set_target_properties(${PROJECT_NAME} PR
+-add_subdirectory(data/tr)
+ 
+ # Installation
+ # macOS bundle parameters
+@@ -241,4 +189,14 @@ set_target_properties(${PROJECT_NAME} PR
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}")
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors")
  # Install data