Wed Dec 21 13:40:24 2016 UTC ()
Newer NetBSD uses POSIX scandir prototype, so adjust.


(joerg)
diff -r1.13 -r1.14 pkgsrc/x11/efltk/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp
diff -r1.9 -r1.10 pkgsrc/x11/fltk2/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/fltk2/patches/patch-ah
cvs diff -r1.13 -r1.14 pkgsrc/x11/efltk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/efltk/distinfo 2015/11/04 03:28:28 1.13
+++ pkgsrc/x11/efltk/distinfo 2016/12/21 13:40:24 1.14
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: distinfo,v 1.13 2015/11/04 03:28:28 agc Exp $ 1$NetBSD: distinfo,v 1.14 2016/12/21 13:40:24 joerg Exp $
2 2
3SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99 3SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
4RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8 4RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
5SHA512 (efltk-2.0.5.tar.bz2) = 869f2d694a8ea4d4d3f3101be359f5a8027e604e662f4bc8ade128caa2e5d6e2dc51ad257243e0805f9381345b9247463a2bb718869bd101f16c43dde348345b 5SHA512 (efltk-2.0.5.tar.bz2) = 869f2d694a8ea4d4d3f3101be359f5a8027e604e662f4bc8ade128caa2e5d6e2dc51ad257243e0805f9381345b9247463a2bb718869bd101f16c43dde348345b
6Size (efltk-2.0.5.tar.bz2) = 1241294 bytes 6Size (efltk-2.0.5.tar.bz2) = 1241294 bytes
7SHA1 (patch-aa) = d87f595661c465fc315b643241b22ef65926906e 7SHA1 (patch-aa) = d87f595661c465fc315b643241b22ef65926906e
8SHA1 (patch-ab) = f6b1fae6962b830ba16ddb5adbb5aec9193ebf59 8SHA1 (patch-ab) = f6b1fae6962b830ba16ddb5adbb5aec9193ebf59
9SHA1 (patch-ac) = cf4474ff83f9630f6b310bc3df0fc16adaff7138 9SHA1 (patch-ac) = cf4474ff83f9630f6b310bc3df0fc16adaff7138
10SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b 10SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b
11SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc 11SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc
12SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd 12SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd
13SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a 13SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a
14SHA1 (patch-ah) = 32768bef3acc3e19b151fbfb87ad63d34cd2ec09 14SHA1 (patch-ah) = 32768bef3acc3e19b151fbfb87ad63d34cd2ec09
15SHA1 (patch-configure_in) = 4d5fad7b0b89e80f6a4e4958a3bdc3c6de572bd5 15SHA1 (patch-configure_in) = 4d5fad7b0b89e80f6a4e4958a3bdc3c6de572bd5
16SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2 16SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2
17SHA1 (patch-efltk_Fl__Int__List_h) = 8883eb41310736fae2a4a7d90119284d14ebe2fe 17SHA1 (patch-efltk_Fl__Int__List_h) = 8883eb41310736fae2a4a7d90119284d14ebe2fe
18SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e 18SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e
19SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366 19SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366
20SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7 20SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7
21SHA1 (patch-efltk_db_Fl__Params_h) = 9bb8574d1558f6ca753e0d9845b6fdaebeac38b4 21SHA1 (patch-efltk_db_Fl__Params_h) = 9bb8574d1558f6ca753e0d9845b6fdaebeac38b4
22SHA1 (patch-src_core_filename_list.cpp) = d58e92fefa478fee2990e06db6455fd54cc30c16 22SHA1 (patch-src_core_filename_list.cpp) = 5c4bc4cac3c0d440b493e4da365a925bdf6a49e7
23SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa 23SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa
24SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea 24SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea
25SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fb44e30fbed6a48ccd0d07348440df503a7e945e 25SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fb44e30fbed6a48ccd0d07348440df503a7e945e
26SHA1 (patch-src_widgets_Fl__Input_cpp) = d1f30bf63ef2000a6b676d5a6205d93ddf1347f3 26SHA1 (patch-src_widgets_Fl__Input_cpp) = d1f30bf63ef2000a6b676d5a6205d93ddf1347f3
27SHA1 (patch-src_widgets_Fl__Text__Editor_cpp) = 6dc9f71019612cbac0fe5fffe0388069d8d23e3b 27SHA1 (patch-src_widgets_Fl__Text__Editor_cpp) = 6dc9f71019612cbac0fe5fffe0388069d8d23e3b
cvs diff -r1.2 -r1.3 pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp 2012/01/28 11:59:06 1.2
+++ pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp 2016/12/21 13:40:24 1.3
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-src_core_filename_list.cpp,v 1.2 2012/01/28 11:59:06 marino Exp $ 1$NetBSD: patch-src_core_filename_list.cpp,v 1.3 2016/12/21 13:40:24 joerg Exp $
2 2
3--- src/core/filename_list.cpp.orig 2003-01-26 01:16:49.000000000 +0000 3--- src/core/filename_list.cpp.orig 2003-01-26 01:16:49.000000000 +0000
4+++ src/core/filename_list.cpp 4+++ src/core/filename_list.cpp
5@@ -46,7 +46,7 @@ int fl_casealphasort(struct dirent **a, 5@@ -41,12 +41,16 @@
 6 int (*compar)(dirent **, dirent **));
 7 #endif
 8
 9+#ifdef __NetBSD__
 10+#include <sys/param.h>
 11+#endif
 12+
 13 int fl_alphasort(struct dirent **a, struct dirent **b) { return strcmp((*a)->d_name, (*b)->d_name); }
 14 int fl_casealphasort(struct dirent **a, struct dirent **b) { return strcasecmp((*a)->d_name, (*b)->d_name); }
6  15
7 int fl_filename_list(const char *dir, dirent ***list, Fl_File_Sort_F *sort)  16 int fl_filename_list(const char *dir, dirent ***list, Fl_File_Sort_F *sort)
8 { 17 {
9-#if defined(__hpux) 18-#if defined(__hpux)
10+#if defined(__hpux) || defined(__DragonFly__) 19+#if defined(__hpux) || defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__-0 >= 799005100)
11 // HP-UX defines the comparison function like this: 20 // HP-UX defines the comparison function like this:
12 return scandir(dir, list, 0, (int(*)(const dirent **, const dirent **))sort); 21 return scandir(dir, list, 0, (int(*)(const dirent **, const dirent **))sort);
13 #elif defined(__osf__) 22 #elif defined(__osf__)
cvs diff -r1.9 -r1.10 pkgsrc/x11/fltk2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/fltk2/Attic/distinfo 2015/11/04 03:28:29 1.9
+++ pkgsrc/x11/fltk2/Attic/distinfo 2016/12/21 13:40:24 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.9 2015/11/04 03:28:29 agc Exp $ 1$NetBSD: distinfo,v 1.10 2016/12/21 13:40:24 joerg Exp $
2 2
3SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5 3SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
4RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f 4RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
5SHA512 (fltk-2.0.x-r6129.tar.bz2) = 840b5bb1db1c035d9bec3b053293a7d03841bd01290a07f21ba79361a6ea1f06e4951682fcc23f6001e427f1bc37eded49c2b42ad9200ac421c3889161e1c2f9 5SHA512 (fltk-2.0.x-r6129.tar.bz2) = 840b5bb1db1c035d9bec3b053293a7d03841bd01290a07f21ba79361a6ea1f06e4951682fcc23f6001e427f1bc37eded49c2b42ad9200ac421c3889161e1c2f9
6Size (fltk-2.0.x-r6129.tar.bz2) = 2593617 bytes 6Size (fltk-2.0.x-r6129.tar.bz2) = 2593617 bytes
7SHA1 (patch-aa) = 344311614b787f1e7b42bde06f2eeee9dc9459e8 7SHA1 (patch-aa) = 344311614b787f1e7b42bde06f2eeee9dc9459e8
8SHA1 (patch-ab) = 80d69520729a397d7b7f03d8ad9cd6a4b7759660 8SHA1 (patch-ab) = 80d69520729a397d7b7f03d8ad9cd6a4b7759660
9SHA1 (patch-ac) = 0c745b7e6da652ca8a7827c1ba0cb80d3e3e7ce8 9SHA1 (patch-ac) = 0c745b7e6da652ca8a7827c1ba0cb80d3e3e7ce8
10SHA1 (patch-ad) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088 10SHA1 (patch-ad) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088
11SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3 11SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3
12SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a 12SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a
13SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748 13SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748
14SHA1 (patch-ah) = 6e098dbcecb3bd307312d94842f5f80fabf2c75f 14SHA1 (patch-ah) = 47eddca382caa8ecc0b393609990290fd18dea7a
15SHA1 (patch-fluid_FluidType.h) = 9fe195316f12794c0fc1a38f47a48e1168437153 15SHA1 (patch-fluid_FluidType.h) = 9fe195316f12794c0fc1a38f47a48e1168437153
cvs diff -r1.1 -r1.2 pkgsrc/x11/fltk2/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/x11/fltk2/patches/Attic/patch-ah 2011/10/30 11:13:12 1.1
+++ pkgsrc/x11/fltk2/patches/Attic/patch-ah 2016/12/21 13:40:24 1.2
@@ -1,22 +1,26 @@ @@ -1,22 +1,26 @@
1$NetBSD: patch-ah,v 1.1 2011/10/30 11:13:12 marino Exp $ 1$NetBSD: patch-ah,v 1.2 2016/12/21 13:40:24 joerg Exp $
2 2
3--- src/filename_list.cxx.orig 2007-06-01 13:13:08.000000000 +0000 3--- src/filename_list.cxx.orig 2007-06-01 13:13:08.000000000 +0000
4+++ src/filename_list.cxx 4+++ src/filename_list.cxx
5@@ -31,6 +31,7 @@ 5@@ -31,6 +31,7 @@
6 #include <ctype.h> 6 #include <ctype.h>
7 #include <string.h> 7 #include <string.h>
8 #include <stdio.h> 8 #include <stdio.h>
9+#include <sys/param.h> 9+#include <sys/param.h>
10 #include <fltk/string.h> 10 #include <fltk/string.h>
11 #include <fltk/utf.h> 11 #include <fltk/utf.h>
12 #include <fltk/filename.h> 12 #include <fltk/filename.h>
13@@ -64,7 +65,8 @@ int fltk::filename_list(const char *d, d 13@@ -62,9 +63,11 @@ int fltk::filename_list(const char *d, d
 14 // This version is when we define our own scandir (WIN32 and perhaps
 15 // some Unix systems):
14 int n = scandir(d, list, 0, sort); 16 int n = scandir(d, list, 0, sort);
15 #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__) 17-#elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__)
 18+#elif defined(__linux) || defined (__FreeBSD__) || (defined (__NetBSD__) && __NetBSD_Version__-0 < 799005100)
16 int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); 19 int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
17-#elif defined(__hpux) || defined(__CYGWIN__) 20-#elif defined(__hpux) || defined(__CYGWIN__)
18+#elif defined(__hpux) || defined(__CYGWIN__) \ 21+#elif defined(__hpux) || defined(__CYGWIN__) \
19+ || (defined(__DragonFly__) && (__DragonFly_version >= 200901)) 22+ || (defined(__DragonFly__) && (__DragonFly_version >= 200901)) \
 23+ || defined (__NetBSD__)
20 // HP-UX, Cygwin define the comparison function like this: 24 // HP-UX, Cygwin define the comparison function like this:
21 int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); 25 int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
22 #elif defined(__osf__) || defined(__sgi) 26 #elif defined(__osf__) || defined(__sgi)