CVS commit: pkgsrc/x11

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Dec 21 13:40:24 UTC 2016

Modified Files:
        pkgsrc/x11/efltk: distinfo
        pkgsrc/x11/efltk/patches: patch-src_core_filename_list.cpp
        pkgsrc/x11/fltk2: distinfo
        pkgsrc/x11/fltk2/patches: patch-ah

Log Message:
Newer NetBSD uses POSIX scandir prototype, so adjust.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/efltk/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/fltk2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/fltk2/patches/patch-ah

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

Modified files:

Index: pkgsrc/x11/efltk/distinfo
diff -u pkgsrc/x11/efltk/distinfo:1.13 pkgsrc/x11/efltk/distinfo:1.14
--- pkgsrc/x11/efltk/distinfo:1.13      Wed Nov  4 03:28:28 2015
+++ pkgsrc/x11/efltk/distinfo   Wed Dec 21 13:40:24 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/04 03:28:28 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/12/21 13:40:24 joerg Exp $
 
 SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
 RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
@@ -19,7 +19,7 @@ SHA1 (patch-efltk_Fl__Text__Buffer.h) = 
 SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366
 SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7
 SHA1 (patch-efltk_db_Fl__Params_h) = 9bb8574d1558f6ca753e0d9845b6fdaebeac38b4
-SHA1 (patch-src_core_filename_list.cpp) = d58e92fefa478fee2990e06db6455fd54cc30c16
+SHA1 (patch-src_core_filename_list.cpp) = 5c4bc4cac3c0d440b493e4da365a925bdf6a49e7
 SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa
 SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea
 SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fb44e30fbed6a48ccd0d07348440df503a7e945e

Index: pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp
diff -u pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp:1.2 pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp:1.3
--- pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp:1.2       Sat Jan 28 11:59:06 2012
+++ pkgsrc/x11/efltk/patches/patch-src_core_filename_list.cpp   Wed Dec 21 13:40:24 2016
@@ -1,13 +1,22 @@
-$NetBSD: patch-src_core_filename_list.cpp,v 1.2 2012/01/28 11:59:06 marino Exp $
+$NetBSD: patch-src_core_filename_list.cpp,v 1.3 2016/12/21 13:40:24 joerg Exp $
 
 --- src/core/filename_list.cpp.orig    2003-01-26 01:16:49.000000000 +0000
 +++ src/core/filename_list.cpp
-@@ -46,7 +46,7 @@ int fl_casealphasort(struct dirent **a,
+@@ -41,12 +41,16 @@
+                                               int (*compar)(dirent **, dirent **));
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
++
+ int fl_alphasort(struct dirent **a, struct dirent **b) { return strcmp((*a)->d_name, (*b)->d_name); }
+ int fl_casealphasort(struct dirent **a, struct dirent **b) { return strcasecmp((*a)->d_name, (*b)->d_name); }
  
  int fl_filename_list(const char *dir, dirent ***list, Fl_File_Sort_F *sort) 
  {
 -#if defined(__hpux)
-+#if defined(__hpux) || defined(__DragonFly__)
++#if defined(__hpux) || defined(__DragonFly__) || (defined (__NetBSD__) && __NetBSD_Version__-0 >= 799005100)
      // HP-UX defines the comparison function like this:
      return scandir(dir, list, 0, (int(*)(const dirent **, const dirent **))sort);
  #elif defined(__osf__)

Index: pkgsrc/x11/fltk2/distinfo
diff -u pkgsrc/x11/fltk2/distinfo:1.9 pkgsrc/x11/fltk2/distinfo:1.10
--- pkgsrc/x11/fltk2/distinfo:1.9       Wed Nov  4 03:28:29 2015
+++ pkgsrc/x11/fltk2/distinfo   Wed Dec 21 13:40:24 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:28:29 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/12/21 13:40:24 joerg Exp $
 
 SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
 RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
@@ -11,5 +11,5 @@ SHA1 (patch-ad) = 21e2f9cb1406c989a83cac
 SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3
 SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a
 SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748
-SHA1 (patch-ah) = 6e098dbcecb3bd307312d94842f5f80fabf2c75f
+SHA1 (patch-ah) = 47eddca382caa8ecc0b393609990290fd18dea7a
 SHA1 (patch-fluid_FluidType.h) = 9fe195316f12794c0fc1a38f47a48e1168437153

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