CVS commit: pkgsrc/misc/xygrib

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Fri Mar 19 19:00:17 UTC 2021

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

Log Message:
update misc/xygrib to build with openjpeg-2.4

Update patch in misc/xygrib so that it can build with openjpeg version 2.4
that is currently in pkgsrc. Also check for 2.5 just in case.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/xygrib/distinfo
cvs rdiff -u -r1.3 -r1.4 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/distinfo
diff -u pkgsrc/misc/xygrib/distinfo:1.5 pkgsrc/misc/xygrib/distinfo:1.6
--- pkgsrc/misc/xygrib/distinfo:1.5     Fri Aug 21 11:31:28 2020
+++ pkgsrc/misc/xygrib/distinfo Fri Mar 19 19:00:17 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2020/08/21 11:31:28 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2021/03/19 19:00:17 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,6 +12,6 @@ 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) = f12e4cc04e94919a8ed5824df859b0573612ab02
+SHA1 (patch-CMakeLists.txt) = 4c6180e4ac20e728ecd3ddf019cd3da84a04835d
 SHA1 (patch-src_CMakeLists.txt) = 3a06026a033e2dbe93ea9d08c48d87f51186918a
 SHA1 (patch-src_SkewT.h) = 71f5d89e04aa4faa8e4812cca82186a834e5786f

Index: pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt
diff -u pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.3 pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt:1.3 Thu Dec  5 17:56:15 2019
+++ pkgsrc/misc/xygrib/patches/patch-CMakeLists.txt     Fri Mar 19 19:00:17 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2019/12/05 17:56:15 nros Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2021/03/19 19:00:17 nros Exp $
 
 * sanitze the names and dirs to search for libs and headers files
 * use PATH_SUFFIX fix to find openjpeg
@@ -83,7 +83,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.3 2019
 -     /opt/local/include # DarwinPorts
 -     /opt/csw/include # Blastwave
 -     /opt/include
-+     PATH_SUFFIXES openjpeg-2.3
++     PATH_SUFFIXES openjpeg-2.4 openjpeg-2.5
       REQUIRED
   )
  include_directories(${OPENJPEG_INCLUDE_DIR})