- Update to 177909

PR:		177909
Submitted by:	ports fury

11 files changed, 154 insertions, 55 deletions

diff --git a/databases/mysql-workbench52/files/52-patch-configure.in b/databases/mysql-workbench52/files/52-patch-configure.in
deleted file mode 100644
index 2d1d81854735..000000000000
--- a/databases/mysql-workbench52/files/52-patch-configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.in.orig	2009-06-19 02:45:09.000000000 +0300
-+++ configure.in	2009-06-23 13:23:55.000000000 +0300
-@@ -35,9 +35,9 @@
-   std_edition=$enableval, std_edition=no)
- 
- if test x$std_edition = xyes; then
--     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
-+     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif" > wb_config.h
- else
--     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
-+     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif" > wb_config.h
- fi
- 
- AC_CHECK_HEADERS([sys/select.h])
diff --git a/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac b/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac
deleted file mode 100644
index f0a1a8708a3e..000000000000
--- a/databases/mysql-workbench52/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- ext/ctemplate/ctemplate-src/configure.ac.orig	2009-06-21 22:09:28.000000000 +0300
-+++ ext/ctemplate/ctemplate-src/configure.ac	2009-06-21 22:11:16.000000000 +0300
-@@ -78,16 +78,16 @@
- AC_SUBST(ac_cv_cxx_hash_namespace)
- AC_SUBST(ac_cv_cxx_hash_map)
- AC_SUBST(ac_cv_cxx_hash_set)
--if test "$ac_cv___attribute__" == "yes"; then
-+if test "$ac_cv___attribute__" = "yes"; then
-    AC_SUBST(ac_google_attribute, 1)
- else
-    AC_SUBST(ac_google_attribute, 0)
- fi
--if test "$ac_cv_type_u_int64_t" == "yes"; then
-+if test "$ac_cv_type_u_int64_t" = "yes"; then
-    AC_SUBST(ac_cv_uint64, u_int64_t)
--elif test "$ac_cv_type_uint64_t" == "yes"; then
-+elif test "$ac_cv_type_uint64_t" = "yes"; then
-    AC_SUBST(ac_cv_uint64, uint64_t)
--elif test "$ac_cv_type___int64" == "yes"; then
-+elif test "$ac_cv_type___int64" = "yes"; then
-    AC_SUBST(ac_cv_uint64, unsigned __int64)
- else
-    AC_SUBST(ac_cv_uint64, unsigned long long)   # best we can do
diff --git a/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am b/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am
deleted file mode 100644
index 268865028a41..000000000000
--- a/databases/mysql-workbench52/files/52-patch-frontend__linux__workbench__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- frontend/linux/workbench/Makefile.am.orig	2009-05-22 03:24:59.000000000 +0300
-+++ frontend/linux/workbench/Makefile.am	2009-06-26 23:10:26.000000000 +0300
-@@ -52,7 +52,7 @@
- 
- 
- mysql-workbench: mysql-workbench.in
--	sed -e "s@#libdir#@$(libdir)@" $< > $@
-+	sed -e "s@#libdir#@$(libdir)@" -e "s|^#!/bin/bash|#!/bin/sh|" mysql-workbench.in > $@
- 
- 
- mysql_workbench_bin_SOURCES=\
diff --git a/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am b/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am
deleted file mode 100644
index e2bc5012f89b..000000000000
--- a/databases/mysql-workbench52/files/52-patch-modules__db__Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- modules/db/Makefile.am.orig	2009-06-21 23:37:59.000000000 +0300
-+++ modules/db/Makefile.am	2009-06-21 23:38:09.000000000 +0300
-@@ -10,4 +10,3 @@
- 
- dbutils_grt_la_SOURCES=src/dbutils.cpp
- dbutils_grt_la_LDFLAGS=-module
--dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la
diff --git a/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am b/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am
new file mode 100644
index 000000000000..e5cf8d8b61e5
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am
@@ -0,0 +1,24 @@
+--- backend/wbprivate/Makefile.am.orig
++++ backend/wbprivate/Makefile.am
+@@ -14,7 +14,7 @@
+   -I$(top_srcdir)/ext/scintilla/include\
+   -I$(top_srcdir)/ext/vsqlite++/include\
+   -I$(top_srcdir)/ext/vsqlite\
+-  -I$(top_srcdir)/ext/tinyxml
++  @TINYXML_CFLAGS@
+ 
+ libwbprivate_a_SOURCES=\
+ 	model/canvas_floater.cpp\
+@@ -78,11 +78,7 @@
+   $(top_srcdir)/frontend/common/grt_python_debugger.cpp\
+   $(top_srcdir)/frontend/common/plugin_manager_window.cpp\
+   $(top_srcdir)/frontend/common/plugin_install_window.cpp\
+-  $(top_srcdir)/frontend/common/select_option_dialog.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++  $(top_srcdir)/frontend/common/select_option_dialog.cpp
+ 
+ #BUILT_SOURCES=stdafx.h.gch
+ #stdafx.h.gch: workbench/stdafx.h
diff --git a/databases/mysql-workbench52/files/patch-configure.in b/databases/mysql-workbench52/files/patch-configure.in
new file mode 100644
index 000000000000..c67ebaa0a1e3
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in.orig
++++ configure.in
+@@ -66,9 +66,9 @@
+   std_edition=$enableval, std_edition=no)
+ 
+ if test x$std_edition = xyes; then
+-     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
++     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h
+ else
+-     echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
++     echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h
+ fi
+ 
+ AC_CHECK_HEADERS([sys/select.h])
+@@ -99,6 +99,10 @@
+     AM_GLIB_GNU_GETTEXT
+ fi
+ 
++PKG_CHECK_MODULES(TINYXML, [tinyxml])
++AC_SUBST(TINYXML_CFLAGS)
++AC_SUBST(TINYXML_LIBS)
++
+ have_zip="no"
+ if test x"$ac_libzip_libs" = x"no"; then
+     PKG_CHECK_MODULES(ZIP, [libzip])
+@@ -205,7 +209,7 @@
+ 		ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config")
+ 
+ AC_MSG_CHECKING([for mysql headers and libraries])
+-MYSQL_INCLUDE=`$ac_mysql_config_path --cflags`
++MYSQL_INCLUDE=`$ac_mysql_config_path --include`
+ MYSQL_LIBS=`$ac_mysql_config_path --libs_r`
+ 
+ if test -z "$MYSQL_INCLUDE"; then
+@@ -248,7 +252,7 @@
+ cfg=sysconfig.get_config_vars()
+ lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
+ if os.path.exists(lib):
+-    print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
++    print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\").rstrip(\".a\")")]
+ PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
+ print sysconfig.get_python_inc()")]
+ PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
+@@ -461,7 +465,7 @@
+ elif test "$(uname -s)" = "SunOS"; then
+ 	DLMAKE="gcc -shared -mimpure-text"
+ else
+-	DLMAKE="gcc -shared"
++	DLMAKE="\$(CC) -shared"
+ fi
+ AC_SUBST(DLEXT)
+ AC_SUBST(DLMAKE)
diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am
new file mode 100644
index 000000000000..a52ba75a5a39
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am
@@ -0,0 +1,10 @@
+--- frontend/linux/workbench/Makefile.am.orig
++++ frontend/linux/workbench/Makefile.am
+@@ -60,6 +60,7 @@
+ 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
+ 	$(top_srcdir)/library/mysql-parser/libmysqlparser.la\
+ 	@CTEMPLATE_LIBS@\
++	@TINYXML_LIBS@\
+ 	@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
+ 	-lX11
+ 
diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in
new file mode 100644
index 000000000000..3c8b1dc878cf
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in
@@ -0,0 +1,17 @@
+--- frontend/linux/workbench/mysql-workbench.in.orig
++++ frontend/linux/workbench/mysql-workbench.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # Uncomment the following line if you're having trouble with gnome-keyring lockups.
+ # This will cause passwords to be stored only temporarily for the session.
+@@ -58,8 +58,4 @@
+ 
+ export MWB_BASE_DIR="$basedirname"
+ 
+-if type -p catchsegv > /dev/null; then
+-catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-else
+ $basedirname/$libexecdir/mysql-workbench-bin "$@"
+-fi
diff --git a/databases/mysql-workbench52/files/patch-library__forms__Makefile.am b/databases/mysql-workbench52/files/patch-library__forms__Makefile.am
new file mode 100644
index 000000000000..ce4d2c2d7b4d
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-library__forms__Makefile.am
@@ -0,0 +1,11 @@
+--- library/forms/Makefile.am.orig
++++ library/forms/Makefile.am
+@@ -91,7 +91,7 @@
+ -I$(top_srcdir)/ext/vsqlite\
+ -I$(top_srcdir)/library/\
+ -I$(top_srcdir)/ext\
+--I$(top_srcdir)/ext/tinyxml\
++@TINYXML_CFLAGS@\
+ -I$(top_srcdir)/ext/scintilla/include
+ 
+ 
diff --git a/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am b/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am
new file mode 100644
index 000000000000..5e80ba4c9ada
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am
@@ -0,0 +1,20 @@
+--- modules/wb.mysql.import/Makefile.am.orig
++++ modules/wb.mysql.import/Makefile.am
+@@ -17,7 +17,7 @@
+ 	-I$(top_srcdir)/library/sql-parser/source/linux\
+ 	-I$(top_srcdir)/ext/vsqlite\
+ 	-I$(top_srcdir)/ext/vsqlite++/include\
+-	-I$(top_srcdir)/ext/tinyxml\
++	@TINYXML_CFLAGS@\
+ 	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+ 
+ 
+@@ -27,7 +27,4 @@
+ wb_mysql_import_grt_la_SOURCES=\
+ 	src/wb_mysql_import.cpp\
+ 	src/wb_mysql_import_dbd4.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++	$(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp
diff --git a/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp b/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
new file mode 100644
index 000000000000..f8e0d2fa40c0
--- /dev/null
+++ b/databases/mysql-workbench52/files/patch-plugins__migration__copytable__copytable.cpp
@@ -0,0 +1,20 @@
+--- plugins/migration/copytable/copytable.cpp.orig
++++ plugins/migration/copytable/copytable.cpp
+@@ -555,7 +555,7 @@
+   //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
+   
+   // convert data from UCS-2 to utf-8
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__FreeBSD__)
+   converted = iconv(_iconv, 
+                     (const char**)&inbuf, &inbuf_len,
+                     (char**)&outbuf, &outbuf_len);
+@@ -617,7 +617,7 @@
+       //log_debug3("Convert string with %i chars to buffer size %i\n", inbuf_len, outbuf_len);
+ 
+       // convert data from UCS-2 to utf-8
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__FreeBSD__)
+       converted = iconv(_iconv, 
+                         (const char**)&inbuf, &inbuf_len,
+                         (char**)&outbuf, &outbuf_len);