databases/mysql-workbench: Fix unportable patch, add DragonFly fix

One patch was hardcoded for NetBSD, return it closer to intention without
breaking NetBSD.  It's still not great, but a little better.

2 files changed, 20 insertions, 11 deletions

diff --git a/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
new file mode 100644
index 00000000000..30d92966c38
--- /dev/null
+++ b/databases/mysql-workbench/patches/patch-library_base_file_utilities.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-library_base_file_utilities.cpp,v 1.1 2012/05/24 18:54:16 marino Exp $
+
+--- library/base/file_utilities.cpp.orig	2011-03-17 12:48:44.000000000 +0000
++++ library/base/file_utilities.cpp
+@@ -31,6 +31,9 @@
+ #include <fcntl.h>
+ #include <sys/file.h>
+ #endif
++#ifdef __DragonFly__
++#include <sys/stat.h>
++#endif
+ 
+ namespace base {
+ 
diff --git a/databases/mysql-workbench/patches/patch-library_base_international_file.cpp b/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
index dd3fdb2809e..24b4fb8bf90 100644
--- a/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
+++ b/databases/mysql-workbench/patches/patch-library_base_international_file.cpp
@@ -1,18 +1,13 @@
-$NetBSD: patch-library_base_international_file.cpp,v 1.1.1.1 2011/05/16 12:40:50 adam Exp $
+$NetBSD: patch-library_base_international_file.cpp,v 1.2 2012/05/24 18:54:17 marino Exp $
 
-Use const string for iconv on all platforms.
-
---- library/base/international_file.cpp.orig	2011-05-16 08:33:28.000000000 +0000
+--- library/base/international_file.cpp.orig	2011-03-17 12:48:42.000000000 +0000
 +++ library/base/international_file.cpp
-@@ -257,11 +257,7 @@ boost::int64_t read_char_from_intl_file(
+@@ -257,7 +257,7 @@ boost::int64_t read_char_from_intl_file(
    else
    {
      gunichar utf8_char= g_utf8_get_char(file->next_utf8_char);
 -#ifdef _WIN32
++#ifndef __DragonFly__
      const char * cur_utf8_char= file->next_utf8_char;
--#else
--    char * cur_utf8_char= file->next_utf8_char;
--#endif
-     file->next_utf8_char= g_utf8_next_char(file->next_utf8_char);
- 
-     *bytes_read= (int) (file->next_utf8_char - cur_utf8_char);
+ #else
+     char * cur_utf8_char= file->next_utf8_char;