diff options
| author | joerg <joerg@pkgsrc.org> | 2016-12-21 13:40:24 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-12-21 13:40:24 +0000 |
| commit | 66e0884d1c7e284941ec2bdf7b1da57b61c8e9ea (patch) | |
| tree | 7e68bce18d1a1623c13a0576226dde7f7922f6ee /x11/fltk2 | |
| parent | fffb04235746fbfc9aac504b78fa94e27686850c (diff) | |
| download | pkgsrc-66e0884d1c7e284941ec2bdf7b1da57b61c8e9ea.tar.gz | |
Newer NetBSD uses POSIX scandir prototype, so adjust.
Diffstat (limited to 'x11/fltk2')
| -rw-r--r-- | x11/fltk2/distinfo | 4 | ||||
| -rw-r--r-- | x11/fltk2/patches/patch-ah | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/x11/fltk2/distinfo b/x11/fltk2/distinfo index 9d998cee8fa..33bdecd78ba 100644 --- a/x11/fltk2/distinfo +++ b/x11/fltk2/distinfo @@ -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) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088 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 diff --git a/x11/fltk2/patches/patch-ah b/x11/fltk2/patches/patch-ah index c6101ce49bf..3a133e33ce5 100644 --- a/x11/fltk2/patches/patch-ah +++ b/x11/fltk2/patches/patch-ah @@ -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:12 marino Exp $ #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) |