CVS commit: pkgsrc/textproc/raptor2

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 12 13:20:05 UTC 2022

Modified Files:
        pkgsrc/textproc/raptor2: distinfo
Added Files:
        pkgsrc/textproc/raptor2/patches: patch-src_sort__r.h

Log Message:
raptor2: add SunOS support


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/raptor2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h

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

Modified files:

Index: pkgsrc/textproc/raptor2/distinfo
diff -u pkgsrc/textproc/raptor2/distinfo:1.13 pkgsrc/textproc/raptor2/distinfo:1.14
--- pkgsrc/textproc/raptor2/distinfo:1.13       Tue Oct 26 11:23:19 2021
+++ pkgsrc/textproc/raptor2/distinfo    Tue Apr 12 13:20:05 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:23:19 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/04/12 13:20:05 tnn Exp $
 
 BLAKE2s (raptor2-2.0.15.tar.gz) = c24882035b615e21fd5ece74be5a565ee7a2dcd6f17619f18143e28727447759
 SHA512 (raptor2-2.0.15.tar.gz) = 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 Size (raptor2-2.0.15.tar.gz) = 1886657 bytes
+SHA1 (patch-src_sort__r.h) = 88d24885b841afe13c509870ed9f16229e8badc4

Added files:

Index: pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h
diff -u /dev/null pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h:1.1
--- /dev/null   Tue Apr 12 13:20:05 2022
+++ pkgsrc/textproc/raptor2/patches/patch-src_sort__r.h Tue Apr 12 13:20:05 2022
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_sort__r.h,v 1.1 2022/04/12 13:20:05 tnn Exp $
+
+SunOS support
+
+--- src/sort_r.h.orig  2014-10-09 23:00:44.000000000 +0000
++++ src/sort_r.h
+@@ -29,6 +29,8 @@ void sort_r(void *base, size_t nel, size
+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
+        defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
+ #  define _SORT_R_LINUX
++#elif defined __sun
++#  define _SORT_R_SUN
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
+ #else
+@@ -86,6 +88,11 @@ void sort_r(void *base, size_t nel, size
+                         __compar_d_fn_t __compar, void *arg)
+       __attribute__((nonnull (1, 4)));
+ 
++  #elif defined _SORT_R_SUN
++
++     extern void qsort_r(void *base, size_t nel, size_t width,
++         int (*compar_arg)(const void *, const void *, void *), void *arg);
++
+   #endif
+ 
+   /* implementation */
+@@ -105,6 +112,10 @@ void sort_r(void *base, size_t nel, size
+       tmp.compar = compar;
+       qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
+ 
++    #elif defined _SORT_R_SUN
++
++      qsort_r(base, nel, width, compar, arg);
++
+     #else /* defined _SORT_R_WINDOWS */
+ 
+       struct sort_r_data tmp;
+@@ -120,5 +131,6 @@ void sort_r(void *base, size_t nel, size
+ #undef _SORT_R_WINDOWS
+ #undef _SORT_R_LINUX
+ #undef _SORT_R_BSD
++#undef _SORT_R_SUN
+ 
+ #endif /* SORT_R_H_ */