Sat Sep 9 15:23:31 2017 UTC ()
Remove gratuitous and wrong #ifdef __DragonFly__ from patch. HI MARINO@!


(dholland)
diff -r1.11 -r1.12 pkgsrc/databases/mysql-workbench/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
cvs diff -r1.11 -r1.12 pkgsrc/databases/mysql-workbench/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql-workbench/Attic/distinfo 2015/11/03 01:56:15 1.11
+++ pkgsrc/databases/mysql-workbench/Attic/distinfo 2017/09/09 15:23:30 1.12
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 01:56:15 agc Exp $ 1$NetBSD: distinfo,v 1.12 2017/09/09 15:23:30 dholland Exp $
2 2
3SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed 3SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed
4RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c 4RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c
5SHA512 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 55c88322947c010f732d1a316b1c0028e05b95c525ef47417f6d49a3d4b1814bb65515f659c591073472ad31e3d9384fa5845ef38c9bb8d19721003a7ad92e4a 5SHA512 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 55c88322947c010f732d1a316b1c0028e05b95c525ef47417f6d49a3d4b1814bb65515f659c591073472ad31e3d9384fa5845ef38c9bb8d19721003a7ad92e4a
6Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes 6Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes
7SHA1 (patch-backend_wbprivate_model_wb__component__physical.cpp) = 710cfb3f90f1112536d86461291531cdbe25a61b 7SHA1 (patch-backend_wbprivate_model_wb__component__physical.cpp) = 710cfb3f90f1112536d86461291531cdbe25a61b
8SHA1 (patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp) = 11d65a32058c646602a6caecbef05883efad85c2 8SHA1 (patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp) = 11d65a32058c646602a6caecbef05883efad85c2
9SHA1 (patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp) = b5f422fb5de8f9853c3536a08ee2470ab17cbe96 9SHA1 (patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp) = b5f422fb5de8f9853c3536a08ee2470ab17cbe96
10SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b 10SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b
11SHA1 (patch-backend_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb 11SHA1 (patch-backend_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb
12SHA1 (patch-backend_wbprivate_workbench_wb__model__file.cpp) = 96231a6cc7969a70196a1e4505549d1a75d7f485 12SHA1 (patch-backend_wbprivate_workbench_wb__model__file.cpp) = 96231a6cc7969a70196a1e4505549d1a75d7f485
13SHA1 (patch-backend_wbprivate_workbench_wb__module.cpp) = 4a7869cf1a223eaa57904801477a258f3c526319 13SHA1 (patch-backend_wbprivate_workbench_wb__module.cpp) = 4a7869cf1a223eaa57904801477a258f3c526319
14SHA1 (patch-backend_wbpublic_grt_grt__structs__tree.cpp) = 46a5f6e66c1bf154ce0e759b8d1671ba889cfe82 14SHA1 (patch-backend_wbpublic_grt_grt__structs__tree.cpp) = 46a5f6e66c1bf154ce0e759b8d1671ba889cfe82
15SHA1 (patch-backend_wbpublic_sqlide_recordset__text__storage.cpp) = 709217d0421ebdb4074157f69fa68af12ba0b02e 15SHA1 (patch-backend_wbpublic_sqlide_recordset__text__storage.cpp) = 709217d0421ebdb4074157f69fa68af12ba0b02e
16SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63 16SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63
17SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4 17SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4
18SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984 18SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
19SHA1 (patch-ext_scintilla_gtk_ScintillaGTK.cxx) = 5900ce9f440a59833d3779c6f3700a2b47f74edf 19SHA1 (patch-ext_scintilla_gtk_ScintillaGTK.cxx) = 5900ce9f440a59833d3779c6f3700a2b47f74edf
20SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459 20SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
21SHA1 (patch-frontend_linux_workbench_Makefile.in) = ad1146700a3d657089b73d86daf8e1da1b6722c6 21SHA1 (patch-frontend_linux_workbench_Makefile.in) = ad1146700a3d657089b73d86daf8e1da1b6722c6
22SHA1 (patch-frontend_linux_workbench_main.cpp) = 0ffcf6695f8aaf52be437d2d9281f788692cccaf 22SHA1 (patch-frontend_linux_workbench_main.cpp) = 0ffcf6695f8aaf52be437d2d9281f788692cccaf
23SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978 23SHA1 (patch-library_base_file_utilities.cpp) = 00e2f119d16ad46c890dbbb761ca2a33ebe1f8d9
24SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b 24SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b
25SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f 25SHA1 (patch-library_canvas_src_mdc__canvas__view__printing_cpp) = 5c3e6c6f63421aa7aa5972a38e4f5b6d87aba71f
26SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a 26SHA1 (patch-library_canvas_src_mdc__canvas__view_h) = 932e1e744ba0663afa0af3d618808fa9448b058a
27SHA1 (patch-library_canvas_src_mdc__draw__util.cpp) = 326fe8ae33020b7e9f86e3d827d33d531ec76b37 27SHA1 (patch-library_canvas_src_mdc__draw__util.cpp) = 326fe8ae33020b7e9f86e3d827d33d531ec76b37
28SHA1 (patch-library_canvas_src_mdc__text.cpp) = 376bea4a00e321a9972a299652f6cf3876f064c1 28SHA1 (patch-library_canvas_src_mdc__text.cpp) = 376bea4a00e321a9972a299652f6cf3876f064c1
29SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce 29SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
30SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1 30SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
31SHA1 (patch-library_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559 31SHA1 (patch-library_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559
32SHA1 (patch-library_grt_src_grtpp.h) = a5c0dd74ffb9352329f2e3b123f46edbaf7220a6 32SHA1 (patch-library_grt_src_grtpp.h) = a5c0dd74ffb9352329f2e3b123f46edbaf7220a6
33SHA1 (patch-library_grt_src_grtpp__shell.cpp) = f2d31b23c1966d256d9a139cd328742da562654d 33SHA1 (patch-library_grt_src_grtpp__shell.cpp) = f2d31b23c1966d256d9a139cd328742da562654d
34SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2 34SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2
35SHA1 (patch-library_grt_src_grtpp__shell__lua__help.cpp) = 526f90d787e7fb64fc51a8cd63382e1c9e15b316 35SHA1 (patch-library_grt_src_grtpp__shell__lua__help.cpp) = 526f90d787e7fb64fc51a8cd63382e1c9e15b316
36SHA1 (patch-library_grt_src_grtpp__shell__python.cpp) = 9aa18665114199d269170f791f83d53f1696042e 36SHA1 (patch-library_grt_src_grtpp__shell__python.cpp) = 9aa18665114199d269170f791f83d53f1696042e
cvs diff -r1.3 -r1.4 pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_file_utilities.cpp (expand / switch to unified diff)

--- pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_file_utilities.cpp 2012/09/15 05:14:07 1.3
+++ pkgsrc/databases/mysql-workbench/patches/Attic/patch-library_base_file_utilities.cpp 2017/09/09 15:23:30 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-library_base_file_utilities.cpp,v 1.3 2012/09/15 05:14:07 obache Exp $ 1$NetBSD: patch-library_base_file_utilities.cpp,v 1.4 2017/09/09 15:23:30 dholland Exp $
 2
 3Use standard headers.
2 4
3--- library/base/file_utilities.cpp.orig 2011-03-17 12:48:44.000000000 +0000 5--- library/base/file_utilities.cpp.orig 2011-03-17 12:48:44.000000000 +0000
4+++ library/base/file_utilities.cpp 6+++ library/base/file_utilities.cpp
5@@ -31,6 +31,9 @@ 7@@ -29,7 +29,9 @@
 8 #else
 9 #include <errno.h>
6 #include <fcntl.h> 10 #include <fcntl.h>
 11+#include <sys/types.h>
7 #include <sys/file.h> 12 #include <sys/file.h>
8 #endif 
9+#ifdef __DragonFly__ 
10+#include <sys/stat.h> 13+#include <sys/stat.h>
11+#endif 14 #endif
12  15
13 namespace base { 16 namespace base {
14