CVS commit: pkgsrc/geography/geos

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 27 13:33:21 UTC 2022

Modified Files:
        pkgsrc/geography/geos: distinfo
Added Files:
        pkgsrc/geography/geos/patches: patch-util_geosop_cxxopts.hpp

Log Message:
geos: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/geography/geos/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/geos/patches/patch-util_geosop_cxxopts.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/geos/distinfo
diff -u pkgsrc/geography/geos/distinfo:1.41 pkgsrc/geography/geos/distinfo:1.42
--- pkgsrc/geography/geos/distinfo:1.41 Sun Mar 13 14:28:59 2022
+++ pkgsrc/geography/geos/distinfo      Sun Mar 27 13:33:21 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.41 2022/03/13 14:28:59 gdt Exp $
+$NetBSD: distinfo,v 1.42 2022/03/27 13:33:21 tnn Exp $
 
 BLAKE2s (geos-3.10.2.tar.bz2) = 461eca761abced3fcd140e7e0d8ca5a779ef438087d2560065c2350be2282648
 SHA512 (geos-3.10.2.tar.bz2) = 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
 Size (geos-3.10.2.tar.bz2) = 6714655 bytes
 SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296
+SHA1 (patch-util_geosop_cxxopts.hpp) = 6da706852b026df7275be0a3caddadd1315f6e81

Added files:

Index: pkgsrc/geography/geos/patches/patch-util_geosop_cxxopts.hpp
diff -u /dev/null pkgsrc/geography/geos/patches/patch-util_geosop_cxxopts.hpp:1.1
--- /dev/null   Sun Mar 27 13:33:21 2022
+++ pkgsrc/geography/geos/patches/patch-util_geosop_cxxopts.hpp Sun Mar 27 13:33:21 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-util_geosop_cxxopts.hpp,v 1.1 2022/03/27 13:33:21 tnn Exp $
+
+On at least modern SunOS, int8_t is typedef'd to char, so parse_value()
+that operates on int8_t& conflicts with the one that operates on char&.
+
+--- util/geosop/cxxopts.hpp.orig       2022-01-15 21:14:55.000000000 +0000
++++ util/geosop/cxxopts.hpp
+@@ -677,12 +677,14 @@ namespace cxxopts
+       integer_parser(text, value);
+     }
+ 
++#if !defined(__sun)
+     inline
+     void
+     parse_value(const std::string& text, int8_t& value)
+     {
+       integer_parser(text, value);
+     }
++#endif
+ 
+     inline
+     void