Tue Feb 11 02:38:38 2020 UTC ()
grafx2: Add upstream bug report URI to a patch


(ryoon)
diff -r1.3 -r1.4 pkgsrc/graphics/grafx2/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/grafx2/patches/patch-help.c
cvs diff -r1.3 -r1.4 pkgsrc/graphics/grafx2/distinfo (switch to unified diff)

--- pkgsrc/graphics/grafx2/distinfo 2020/02/10 13:08:10 1.3
+++ pkgsrc/graphics/grafx2/distinfo 2020/02/11 02:38:37 1.4
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.3 2020/02/10 13:08:10 ryoon Exp $ 1$NetBSD: distinfo,v 1.4 2020/02/11 02:38:37 ryoon Exp $
2 2
3SHA1 (grafx2-2.7.2950-src.tgz) = 126fa87c1bcd18af0215b24451828c37d6c45f31 3SHA1 (grafx2-2.7.2950-src.tgz) = 126fa87c1bcd18af0215b24451828c37d6c45f31
4RMD160 (grafx2-2.7.2950-src.tgz) = c9a2ca8c59d0229b296bb2eeac3293a7a2fbd679 4RMD160 (grafx2-2.7.2950-src.tgz) = c9a2ca8c59d0229b296bb2eeac3293a7a2fbd679
5SHA512 (grafx2-2.7.2950-src.tgz) = 1f13d17327b55d040cca63bf804f81ff2cc8a57ef6c3418d5da2e84c090b3c2b62ed348abfb95b50f11ceea80637477e8cfd3d277dfd5c8949fbdb7620098cec 5SHA512 (grafx2-2.7.2950-src.tgz) = 1f13d17327b55d040cca63bf804f81ff2cc8a57ef6c3418d5da2e84c090b3c2b62ed348abfb95b50f11ceea80637477e8cfd3d277dfd5c8949fbdb7620098cec
6Size (grafx2-2.7.2950-src.tgz) = 1104406 bytes 6Size (grafx2-2.7.2950-src.tgz) = 1104406 bytes
7SHA1 (patch-help.c) = 769082d899ee7e3e88fa789f59d26db723d7c8ee 7SHA1 (patch-help.c) = 6b889198e644c1cf720956f1b2003032d09c1013
8SHA1 (patch-main.c) = 3116bf8990994265132ce95fec1ca13a0b735912 8SHA1 (patch-main.c) = 3116bf8990994265132ce95fec1ca13a0b735912
9SHA1 (patch-misc.c) = 19d9c3225babd1f62c14def892b77a8691edb0a6 9SHA1 (patch-misc.c) = 19d9c3225babd1f62c14def892b77a8691edb0a6
cvs diff -r1.2 -r1.3 pkgsrc/graphics/grafx2/patches/Attic/patch-help.c (switch to unified diff)

--- pkgsrc/graphics/grafx2/patches/Attic/patch-help.c 2020/02/10 13:08:10 1.2
+++ pkgsrc/graphics/grafx2/patches/Attic/patch-help.c 2020/02/11 02:38:37 1.3
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1$NetBSD: patch-help.c,v 1.2 2020/02/10 13:08:10 ryoon Exp $ 1$NetBSD: patch-help.c,v 1.3 2020/02/11 02:38:37 ryoon Exp $
2 2
3Use statvfs on NetBSD. 3Use statvfs on NetBSD.
 4https://gitlab.com/GrafX2/grafX2/-/merge_requests/274
4 5
5--- help.c.orig 2020-02-06 21:01:27.000000000 +0000 6--- help.c.orig 2020-02-06 21:01:27.000000000 +0000
6+++ help.c 7+++ help.c
7@@ -31,9 +31,11 @@ 8@@ -31,9 +31,11 @@
8 #if defined(_MSC_VER) && _MSC_VER < 1900 9 #if defined(_MSC_VER) && _MSC_VER < 1900
9 #define snprintf _snprintf 10 #define snprintf _snprintf
10 #endif 11 #endif
11-#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) 12-#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
12+#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__) 13+#elif defined(__macosx__) || defined(__FreeBSD__) || defined(__OpenBSD__)
13 #include <sys/param.h> 14 #include <sys/param.h>
14 #include <sys/mount.h> 15 #include <sys/mount.h>
15+#elif defined(__NetBSD__) 16+#elif defined(__NetBSD__)
16+ #include <sys/statvfs.h> 17+ #include <sys/statvfs.h>
17 #elif defined (__linux__) || defined(__SYLLABLE__) 18 #elif defined (__linux__) || defined(__SYLLABLE__)
18 #include <sys/vfs.h> 19 #include <sys/vfs.h>
19 #elif defined (__HAIKU__) 20 #elif defined (__HAIKU__)
20@@ -976,12 +978,18 @@ void Button_Stats(int btn) 21@@ -976,12 +978,18 @@ void Button_Stats(int btn)
21 GFX2_Log(GFX2_ERROR, "GetDiskFreeSpaceExA() failed\n"); 22 GFX2_Log(GFX2_ERROR, "GetDiskFreeSpaceExA() failed\n");
22 } 23 }
23 } 24 }
24-#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) || defined(__NetBSD__) 25-#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) || defined(__NetBSD__)
25+#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__) 26+#elif defined(__linux__) || defined(__macosx__) || defined(__FreeBSD__) || defined(__SYLLABLE__) || defined(__AROS__) || defined(__OpenBSD__)
26 { 27 {
27 struct statfs disk_info; 28 struct statfs disk_info;
28 statfs(Main.selector.Directory,&disk_info); 29 statfs(Main.selector.Directory,&disk_info);
29 mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize; 30 mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize;
30 } 31 }
31+#elif defined(__NetBSD__) 32+#elif defined(__NetBSD__)
32+ { 33+ {
33+ struct statvfs disk_info; 34+ struct statvfs disk_info;
34+ statvfs(Main.selector.Directory,&disk_info); 35+ statvfs(Main.selector.Directory,&disk_info);
35+ mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize; 36+ mem_size=(qword) disk_info.f_bfree * (qword) disk_info.f_bsize;
36+ } 37+ }
37 #elif defined(__HAIKU__) 38 #elif defined(__HAIKU__)
38 mem_size = haiku_get_free_space(Main.selector.Directory); 39 mem_size = haiku_get_free_space(Main.selector.Directory);
39 #elif defined (__MINT__) 40 #elif defined (__MINT__)