summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-28 06:09:35 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-28 06:09:35 +0800
commitbc022871cb6493f735ab574abb04ac5b742d11b7 (patch)
tree1b17dc22b4865e6edf7f9ca7036e54aa235487a8 /databases
parentea2f55347817345b3e78f6333dc8a5d3a8d147a3 (diff)
downloadmarcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar.gz
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar.bz2
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar.lz
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar.xz
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.tar.zst
marcuscom-ports-bc022871cb6493f735ab574abb04ac5b742d11b7.zip
Fix build.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13056 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql-gui-tools/Makefile100
-rw-r--r--databases/mysql-gui-tools/distinfo3
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc11
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc29
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc20
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h11
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h11
-rw-r--r--databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc11
-rw-r--r--databases/mysql-gui-tools/files/patch-automatic_column_width45
-rw-r--r--databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc13
-rw-r--r--databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc24
-rw-r--r--databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc18
-rw-r--r--databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h11
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-configure.in21
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc38
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc12
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h20
-rw-r--r--databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am31
-rw-r--r--databases/mysql-gui-tools/pkg-descr10
-rw-r--r--databases/mysql-gui-tools/pkg-plist419
20 files changed, 858 insertions, 0 deletions
diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile
new file mode 100644
index 000000000..49c9bc83e
--- /dev/null
+++ b/databases/mysql-gui-tools/Makefile
@@ -0,0 +1,100 @@
+# vim: ts=8
+# New ports collection makefile for: MySQL GUI Tools
+# Date created: 6 March 2008
+# Whom: gahr
+#
+# $FreeBSD: ports/databases/mysql-gui-tools/Makefile,v 1.8 2009/08/02 19:32:46 mezz Exp $
+#
+
+PORTNAME= mysql-gui-tools
+PORTVERSION= 5.0r14
+PORTREVISION= 1
+CATEGORIES= databases
+MASTER_SITES= ${MASTER_SITE_MYSQL}
+MASTER_SITE_SUBDIR= MySQLGUITools
+
+MAINTAINER= gahr@FreeBSD.org
+COMMENT= The MySQL Administrator, Query Browser and Workbench GUI tools
+
+LIB_DEPENDS= mysqlclient.15:${PORTSDIR}/databases/mysql50-client \
+ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+ pcre.0:${PORTSDIR}/devel/pcre \
+ xml2.5:${PORTSDIR}/textproc/libxml2
+
+OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \
+ ADMINISTRATOR "Build the MySQL Administrator" on
+
+USE_AUTOTOOLS= autoconf:262 libtool:22 automake:110
+USE_GNOME= libgnome libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview
+USE_GL= gl glut
+USE_GMAKE= yes
+
+DATADIR= ${PREFIX}/share/mysql-gui
+
+HAS_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+# `pkg-config --cflags libgnomeui-2.0`" \
+
+CONFIGURE_ARGS+= --with-gtkhtml=libgtkhtml-3.14
+
+.include <bsd.port.pre.mk>
+
+SUBDIRS= common
+
+.if !defined(WITHOUT_QUERY_BROWSER)
+SUBDIRS+= query-browser
+PLIST_SUB+= QUERY_BROWSER=""
+.else
+PLIST_SUB+= QUERY_BROWSER="@comment "
+.endif
+
+.if !defined(WITHOUT_ADMINISTRATOR)
+SUBDIRS+= administrator
+PLIST_SUB+= ADMINISTRATOR=""
+.else
+PLIST_SUB+= ADMINISTRATOR="@comment "
+.endif
+
+.if defined(WITHOUT_ADMINISTRATOR) && defined(WITHOUT_QUERY_BROWSER) && defined(WITHOUT_MIGRATION_TOOL)
+IGNORE= please run 'make config' again and select at least one component
+.endif
+
+post-patch:
+# switch to new directory name not complete
+ (cd ${WRKSRC} && ${LN} -sf common mysql-gui-common)
+# UTF-8 input file
+ (LC_CTYPE=C ${TR} -d "\357\273\277" < \
+ ${WRKSRC}/common/library/base-library/source/myx_database_model.c > \
+ ${WRKSRC}/common/library/base-library/source/myx_database_model.c.new && \
+ ${MV} ${WRKSRC}/common/library/base-library/source/myx_database_model.c.new \
+ ${WRKSRC}/common/library/base-library/source/myx_database_model.c)
+
+ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/query-browser/source/linux/Makefile.am
+
+# Run-time paths
+ ${REINPLACE_CMD} -e 's|MQB_DIR="$$DIRNAME"|MQB_DIR=""|' \
+ ${WRKSRC}/query-browser/source/linux/mysql-query-browser
+ ${REINPLACE_CMD} -e 's|MA_DIR="$$DIRNAME"|MA_DIR=""|' \
+ ${WRKSRC}/administrator/source/linux/mysql-administrator
+
+run-autotools:
+do-configure:
+.for dir in ${SUBDIRS}
+ (cd ${WRKSRC}/${dir} && ${SH} autogen.sh ${CONFIGURE_ARGS} && \
+ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} \
+ )
+.endfor
+
+do-build:
+.for dir in ${SUBDIRS}
+ cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}
+.endfor
+
+do-install:
+.for dir in ${SUBDIRS}
+ cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/databases/mysql-gui-tools/distinfo b/databases/mysql-gui-tools/distinfo
new file mode 100644
index 000000000..ca32e11fe
--- /dev/null
+++ b/databases/mysql-gui-tools/distinfo
@@ -0,0 +1,3 @@
+MD5 (mysql-gui-tools-5.0r14.tar.gz) = b8efefbf20b7264c8f3afd34424467d7
+SHA256 (mysql-gui-tools-5.0r14.tar.gz) = 95e594754ffeb509f8fa1e3c392ee23308d0f4abe7ff6d311a72b0df16b300b9
+SIZE (mysql-gui-tools-5.0r14.tar.gz) = 24897382
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc
new file mode 100644
index 000000000..880eb723f
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MABackupPanel.cc
@@ -0,0 +1,11 @@
+--- administrator/source/linux/MABackupPanel.cc.orig 2009-07-08 12:06:17.000000000 +0200
++++ administrator/source/linux/MABackupPanel.cc 2009-07-08 12:06:37.000000000 +0200
+@@ -1282,7 +1282,7 @@
+
+ if (_inst->check_connection())
+ {
+- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
+ 50);
+ dlg->show();
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc
new file mode 100644
index 000000000..e57e6f53c
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MACatalogsPanel.cc
@@ -0,0 +1,29 @@
+--- administrator/source/linux/MACatalogsPanel.cc.orig 2009-07-08 12:51:09.000000000 +0200
++++ administrator/source/linux/MACatalogsPanel.cc 2009-07-08 12:51:33.000000000 +0200
+@@ -1488,7 +1488,7 @@
+
+ _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
+ _maint_dlg_xml->get_note("note")->set_current_page(4);
+- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+
+ status= (MYX_TABLE_COMMAND_STATUSES*)
+ _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,
+@@ -1528,7 +1528,7 @@
+
+ _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
+ _maint_dlg_xml->get_note("note")->set_current_page(4);
+- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+
+ status= (MYX_TABLE_COMMAND_STATUSES*)
+ _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,
+@@ -1568,7 +1568,7 @@
+
+ _maint_dlg_xml->get_button("next_button")->set_sensitive(false);
+ _maint_dlg_xml->get_note("note")->set_current_page(4);
+- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
++ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);
+
+ status= (MYX_TABLE_COMMAND_STATUSES*)
+ _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc
new file mode 100644
index 000000000..542ba5f73
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MARestorePanel.cc
@@ -0,0 +1,20 @@
+--- administrator/source/linux/MARestorePanel.cc.orig 2009-07-08 12:49:02.000000000 +0200
++++ administrator/source/linux/MARestorePanel.cc 2009-07-08 12:49:13.000000000 +0200
+@@ -728,7 +728,7 @@
+ op_aborted= false;
+
+ {
+- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
+ 50);
+
+@@ -854,7 +854,7 @@
+ //{
+ MYX_BACKUP_ERROR err;
+
+- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
++ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
+ (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
+ 50);
+
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h
new file mode 100644
index 000000000..51aa715df
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAServerConnectionsPanel.h
@@ -0,0 +1,11 @@
+--- administrator/source/linux/MAServerConnectionsPanel.h.orig 2009-07-08 12:01:06.000000000 +0200
++++ administrator/source/linux/MAServerConnectionsPanel.h 2009-07-08 12:01:13.000000000 +0200
+@@ -87,7 +87,7 @@
+
+ Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
+
+- SigC::Connection _timer;
++ sigc::connection _timer;
+
+ int _current_page;
+
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h
new file mode 100644
index 000000000..fde28952a
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MAdministrator.h
@@ -0,0 +1,11 @@
+--- administrator/source/linux/MAdministrator.h.orig 2009-07-08 11:51:36.000000000 +0200
++++ administrator/source/linux/MAdministrator.h 2009-07-08 11:55:04.000000000 +0200
+@@ -66,7 +66,7 @@
+
+ sigc::signal0<void> _signal_prefs_changed;
+
+- SigC::Connection _pulse_conn;
++ sigc::connection _pulse_conn;
+ bool pulse_progress();
+
+ void setup_sidebar();
diff --git a/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc
new file mode 100644
index 000000000..b3c0575c5
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-administrator-source-linux_MInstanceInfo.cc
@@ -0,0 +1,11 @@
+--- administrator/source/linux/MInstanceInfo.cc.orig 2009-07-08 11:56:19.000000000 +0200
++++ administrator/source/linux/MInstanceInfo.cc 2009-07-08 11:58:17.000000000 +0200
+@@ -1124,7 +1124,7 @@
+ char *buffer= (char*)g_malloc(diff+1);
+ int fd= open(path.c_str(), O_RDONLY);
+
+- lseek64(fd, _log_file_pos, SEEK_SET);
++ lseek(fd, _log_file_pos, SEEK_SET);
+ if ((len= read(fd, buffer, diff)) < 0)
+ {
+ close(fd);
diff --git a/databases/mysql-gui-tools/files/patch-automatic_column_width b/databases/mysql-gui-tools/files/patch-automatic_column_width
new file mode 100644
index 000000000..450f79246
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-automatic_column_width
@@ -0,0 +1,45 @@
+--- query-browser/source/linux/MQResultSetView.cc~ 2007-04-27 14:46:09.000000000 +0200
++++ query-browser/source/linux/MQResultSetView.cc 2009-01-04 20:59:03.000000000 +0100
+@@ -474,7 +474,29 @@
+ PIXCACHE->load("field_overlay_view.png"),
+ PIXCACHE->load("field_overlay_null.png"));
+ rend->set_blob_icon(PIXCACHE->load("blob_icon.png"));
+- rend->set_max_text_width(prefs.max_blob_length);
++ if (prefs.max_blob_length == 0)
++ {
++ unsigned int w = 1;
++
++ if (result->columns[i].column_type == MYX_RSCT_TEXT)
++ for (unsigned int j = 0; j < result->rows_num; j++)
++ {
++ gchar *gcp;
++ gssize nbytes = result->rows[j].fields[i].value_length;
++
++ if ((gcp = g_utf8_strchr(result->rows[j].fields[i].value,
++ nbytes, g_utf8_get_char("\n"))) != NULL)
++ nbytes = gcp - result->rows[j].fields[i].value;
++ glong this_len = g_utf8_strlen(result->rows[j].fields[i].value, nbytes);
++ if (this_len > w)
++ w = this_len;
++ }
++ rend->set_max_text_width(w);
++ }
++ else
++ {
++ rend->set_max_text_width(prefs.max_blob_length);
++ }
+ rend->property_column()= i;
+ rend->set_delegate(this);
+
+--- query-browser/res/linux/qb_preferences.glade~ 2006-05-16 03:04:19.000000000 +0200
++++ query-browser/res/linux/qb_preferences.glade 2009-01-02 19:14:04.000000000 +0100
+@@ -116,7 +116,8 @@
+ <widget class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;small&gt;BLOB/text columns in resultsets will be truncated
+-to this size for display.&lt;/small&gt;</property>
++to this size for display. Value 0 means automatic
++column width (i.e., width of largest value).&lt;/small&gt;</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc
new file mode 100644
index 000000000..00fc479df
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MDispatcher.cc
@@ -0,0 +1,13 @@
+--- common/source/linux/MDispatcher.cc.orig 2008-09-25 08:24:31.000000000 +0000
++++ common/source/linux/MDispatcher.cc 2008-09-25 08:25:09.000000000 +0000
+@@ -21,8 +21,8 @@
+ #include <unistd.h>
+ #include <mysql.h>
+
+-#define MX_LOCK(mx) { if (0) g_message("[%i]:%s: LOCK %s", (int)pthread_self(), __FUNCTION__, #mx); pthread_mutex_lock(mx); }
+-#define MX_UNLOCK(mx) { if (0) g_message("[%i]:%s: UNLOCK %s", (int)pthread_self(), __FUNCTION__, #mx); pthread_mutex_unlock(mx); }
++#define MX_LOCK(mx) { if (0) g_message("[%lu]:%s: LOCK %s", (unsigned long)pthread_self(), __FUNCTION__, #mx); pthread_mutex_lock(mx); }
++#define MX_UNLOCK(mx) { if (0) g_message("[%lu]:%s: UNLOCK %s", (unsigned long)pthread_self(), __FUNCTION__, #mx); pthread_mutex_unlock(mx); }
+
+
+ void *MDispatcher::thread_func(Fetcher *self)
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc
new file mode 100644
index 000000000..2487c9a17
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGConnectDialog.cc
@@ -0,0 +1,24 @@
+--- common/source/linux/MGConnectDialog.cc.orig 2006-12-05 23:44:08.000000000 +0100
++++ common/source/linux/MGConnectDialog.cc 2007-11-08 16:21:54.000000000 +0100
+@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_ed
+ // select back the original item
+ ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
+
+- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
++ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
+ &MGConnectDialog::preferences_closed));
+- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
++ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
+ &MGConnectDialog::preferences_changed));
+ MGPreferencesEditor::instance()->show(true);
+ MGPreferencesEditor::instance()->set_modal(true);
+@@ -676,7 +676,7 @@ void MGConnectDialog::show_connection_fa
+ {
+ Gtk::Button *btn;
+ pid_t ping_pid= 0;
+- SigC::Connection input_handler;
++ sigc::connection input_handler;
+ int rc;
+ bool pinging= false;
+ int myerror= 0;
+
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc b/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc
new file mode 100644
index 000000000..5ca17635c
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGExecSU.cc
@@ -0,0 +1,18 @@
+--- common/source/linux/MGExecSU.cc.orig 2008-03-07 01:50:54.000000000 +0100
++++ common/source/linux/MGExecSU.cc 2008-03-07 01:52:50.000000000 +0100
+@@ -5,10 +5,14 @@
+ #include "myg_gtkutils.h"
+ #include "mygpriv.h"
+ #include <sys/signal.h>
++#include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <pty.h>
++#include <termios.h>
++#include <libutil.h>
+ #include <fcntl.h>
+
+
diff --git a/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h b/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h
new file mode 100644
index 000000000..049bc1ed5
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-common-source-linux_MGTreeTooltip.h
@@ -0,0 +1,11 @@
+--- common/source/linux/MGTreeTooltip.h.orig 2009-07-07 17:08:50.000000000 +0200
++++ common/source/linux/MGTreeTooltip.h 2009-07-07 17:09:06.000000000 +0200
+@@ -39,7 +39,7 @@
+
+ WillShowSignal _show_signal;
+
+- SigC::Connection _timeout;
++ sigc::connection _timeout;
+
+ void expose_event(GdkEventExpose *event);
+ void leave_event(GdkEventCrossing *event);
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-configure.in b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
new file mode 100644
index 000000000..0d86b9fd3
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-configure.in
@@ -0,0 +1,21 @@
+--- query-browser/configure.in.orig 2009-09-27 23:40:34.000000000 +0200
++++ query-browser/configure.in 2009-09-27 23:41:02.000000000 +0200
+@@ -66,7 +66,7 @@
+ gtkhtml=$withval, gtkhtml=libgtkhtml-3.0)
+
+
+-PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2])
++PKG_CHECK_MODULES(GLIB, [glib-2.0 libxml-2.0 >= 2.6.2 libgnome-2.0])
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+
+@@ -74,7 +74,8 @@
+ gthread-2.0
+ libxml-2.0 >= 2.6.2
+ $gtkhtml
+- gtkmm-2.4])
++ gtkmm-2.4
++ libgnome-2.0])
+ AC_SUBST(GNOME_CFLAGS)
+ AC_SUBST(GNOME_LIBS)
+
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc
new file mode 100644
index 000000000..69e2a91fa
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MGCodeEditor.cc
@@ -0,0 +1,38 @@
+--- query-browser/source/linux/MGCodeEditor.cc.orig 2009-07-08 11:17:31.000000000 +0200
++++ query-browser/source/linux/MGCodeEditor.cc 2009-07-08 11:22:58.000000000 +0200
+@@ -39,6 +39,7 @@
+ _wrapper->show();
+
+ gtk_source_view_set_show_line_markers(GTK_SOURCE_VIEW(_srcv), TRUE);
++#if 0
+ gtk_source_view_set_compose_line_markers(GTK_SOURCE_VIEW(_srcv), FALSE);
+
+ bg_color= Gdk::Color("#ffa6a6");
+@@ -54,6 +55,7 @@
+ _wrapper->get_colormap()->alloc_color(fg_color);
+ gtk_source_view_set_marker_highlight_colors(GTK_SOURCE_VIEW(_srcv), "pc",
+ fg_color.gobj(), bg_color.gobj());
++#endif
+ }
+
+
+@@ -157,7 +159,9 @@
+ {
+ _pc_marker= gtk_source_buffer_create_marker(_buffer, "pc", "pc",
+ iter.gobj());
++#if 0
+ gtk_source_marker_set_priority(_pc_marker, 100);
++#endif
+ }
+ else
+ gtk_source_buffer_move_marker(_buffer, _pc_marker, iter.gobj());
+@@ -264,7 +268,9 @@
+ {
+ marker= gtk_source_buffer_create_marker(_buffer, NULL, "breakpoint",
+ iter.gobj());
++#if 0
+ gtk_source_marker_set_priority(marker, 10);
++#endif
+ }
+ }
+ _wrapper->queue_draw();
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc
new file mode 100644
index 000000000..aae9361a3
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQQueryDispatcher.cc
@@ -0,0 +1,12 @@
+--- query-browser/source/linux/MQQueryDispatcher.cc.orig 2009-07-16 16:30:10.000000000 +0200
++++ query-browser/source/linux/MQQueryDispatcher.cc 2009-07-16 16:33:04.000000000 +0200
+@@ -558,9 +558,6 @@
+
+ Gtk::Main::instance()->run();
+
+- while(!req->is_complete())
+- ;
+-
+ return sps;
+ }
+
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h
new file mode 100644
index 000000000..8bed353a0
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_MQResultTab.h
@@ -0,0 +1,20 @@
+--- query-browser/source/linux/MQResultTab.h.orig 2009-07-07 17:12:56.000000000 +0200
++++ query-browser/source/linux/MQResultTab.h 2009-07-07 17:13:17.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ Gtk::Paned *paned;
+
+- SigC::Connection scroll_con;
++ sigc::connection scroll_con;
+ };
+
+ enum CompareAction {
+@@ -71,7 +71,7 @@
+
+ bool _vertical;
+
+- SigC::Connection _sync_con1, _sync_con2;
++ sigc::connection _sync_con1, _sync_con2;
+
+ void scrolled(MQResultSetView *sender);
+ void activated(MQResultSetView *sender);
diff --git a/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am
new file mode 100644
index 000000000..d2cc82065
--- /dev/null
+++ b/databases/mysql-gui-tools/files/patch-query-browser-source-linux_Makefile.am
@@ -0,0 +1,31 @@
+--- query-browser/source/linux/Makefile.am.orig 2006-12-13 06:18:53.000000000 +0100
++++ query-browser/source/linux/Makefile.am 2009-07-08 11:26:35.000000000 +0200
+@@ -40,7 +40,7 @@
+ -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\
+ -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\
+ -I$(top_srcdir)/library/include\
+- -I$(top_srcdir)/source/linux/gtksourceview\
++ -I%%LOCALBASE%%/include/gtksourceview-1.0\
+ -DPREFIX=\""$(PREFIX)"\"\
+ -DDATADIRNAME=\""$(DATADIRNAME)"\"\
+ -DCOMMONDIRNAME=\""$(MG_COMMONDIR)"\"\
+@@ -52,18 +52,4 @@
+ $(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\
+ $(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\
+ $(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\
+- $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\
+- @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@
+-
+-#
+-# Can't add this as a AC_CONFIG_SUBDIRS in configure.in because
+-# toplevel autogen.sh is breaking the configure scripts in gtksourceview
+-# If a solution is found, this could be removed.
+-#
+-$(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a:
+- (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
+-
+-clean-generic:
+- -make -C gtksourceview distclean
+- (cd gtksourceview; rm -fr autom4te.cache config.log)
+-
++ @MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@ -L%%LOCALBASE%%/lib -lgtksourceview-1.0
diff --git a/databases/mysql-gui-tools/pkg-descr b/databases/mysql-gui-tools/pkg-descr
new file mode 100644
index 000000000..8a251e8e1
--- /dev/null
+++ b/databases/mysql-gui-tools/pkg-descr
@@ -0,0 +1,10 @@
+The MySQL GUI Tools package includes the MySQL Administrator and the
+MySQL Query Browser tools.
+The MySQL Administrator is a powerful visual administration tool that
+makes it easy to administer and monitor your MySQL environment and
+gain significantly better visibility into how your databases are
+operating.
+MySQL Query Browser is the easiest visual tool for creating,
+executing, and optimizing SQL queries for your MySQL Database Server.
+
+WWW: http://www.mysql.com
diff --git a/databases/mysql-gui-tools/pkg-plist b/databases/mysql-gui-tools/pkg-plist
new file mode 100644
index 000000000..cdf56d10e
--- /dev/null
+++ b/databases/mysql-gui-tools/pkg-plist
@@ -0,0 +1,419 @@
+%%DATADIR%%/common/16x16_Catalog.png
+%%DATADIR%%/common/16x16_Database.png
+%%DATADIR%%/common/16x16_Field.png
+%%DATADIR%%/common/16x16_KeyColumn.png
+%%DATADIR%%/common/16x16_Table.png
+%%DATADIR%%/common/16x16_User.png
+%%DATADIR%%/common/16x16_Users.png
+%%DATADIR%%/common/asset_index.png
+%%DATADIR%%/common/asset_index_16x16.png
+%%DATADIR%%/common/asset_table.png
+%%DATADIR%%/common/asset_table_16x16.png
+%%DATADIR%%/common/auth_dialog.glade
+%%DATADIR%%/common/blob_icon.png
+%%DATADIR%%/common/busy.png
+%%DATADIR%%/common/checkmark.png
+%%DATADIR%%/common/column.png
+%%DATADIR%%/common/column_11x11.png
+%%DATADIR%%/common/column_fk.png
+%%DATADIR%%/common/column_fk_11x11.png
+%%DATADIR%%/common/column_pk.png
+%%DATADIR%%/common/column_pk_11x11.png
+%%DATADIR%%/common/connect_dialog.glade
+%%DATADIR%%/common/connect_to_instance.png
+%%DATADIR%%/common/datatype_blob.png
+%%DATADIR%%/common/datatype_datetime.png
+%%DATADIR%%/common/datatype_numeric.png
+%%DATADIR%%/common/datatype_spatial.png
+%%DATADIR%%/common/datatype_string.png
+%%DATADIR%%/common/datatype_userdefined.png
+%%DATADIR%%/common/dockpnl_bg.png
+%%DATADIR%%/common/dockpnl_bg_logo.png
+%%DATADIR%%/common/edit_disabled.png
+%%DATADIR%%/common/edit_enabled.png
+%%DATADIR%%/common/editor_table_auto_inc.png
+%%DATADIR%%/common/editor_table_not_null.png
+%%DATADIR%%/common/field_overlay_clear.png
+%%DATADIR%%/common/field_overlay_edit.png
+%%DATADIR%%/common/field_overlay_load.png
+%%DATADIR%%/common/field_overlay_null.png
+%%DATADIR%%/common/field_overlay_save.png
+%%DATADIR%%/common/field_overlay_view.png
+%%DATADIR%%/common/folder_16x16.png
+%%DATADIR%%/common/grt_routines_editor.glade
+%%DATADIR%%/common/grt_schema_editor.glade
+%%DATADIR%%/common/grt_table_editor.glade
+%%DATADIR%%/common/grt_view_editor.glade
+%%DATADIR%%/common/how_to_translate.txt
+%%DATADIR%%/common/magnify_glass.png
+%%DATADIR%%/common/magnify_glass_with_popup.png
+%%DATADIR%%/common/messagedlg_confirmation.png
+%%DATADIR%%/common/messagedlg_edit.png
+%%DATADIR%%/common/messagedlg_error.png
+%%DATADIR%%/common/messagedlg_information.png
+%%DATADIR%%/common/messagedlg_warning.png
+%%DATADIR%%/common/mini_add.png
+%%DATADIR%%/common/mini_add_12.png
+%%DATADIR%%/common/mini_add_pressed.png
+%%DATADIR%%/common/mini_add_pressed_12.png
+%%DATADIR%%/common/mini_del.png
+%%DATADIR%%/common/mini_del_12.png
+%%DATADIR%%/common/mini_del_pressed.png
+%%DATADIR%%/common/mini_del_pressed_12.png
+%%DATADIR%%/common/mini_error.png
+%%DATADIR%%/common/mini_notice.png
+%%DATADIR%%/common/mini_warning.png
+%%DATADIR%%/common/minus.png
+%%DATADIR%%/common/mysql_logo.png
+%%DATADIR%%/common/mysqlx_dbm_charsets.xml
+%%DATADIR%%/common/mysqlx_dbm_datatypes.xml
+%%DATADIR%%/common/myx_schema_16x16.png
+%%DATADIR%%/common/myx_schema_sp_16x16.png
+%%DATADIR%%/common/myx_schema_table_16x16.png
+%%DATADIR%%/common/myx_schema_view_16x16.png
+%%DATADIR%%/common/networkhost_16x16.png
+%%DATADIR%%/common/options_admin.png
+%%DATADIR%%/common/options_bg.png
+%%DATADIR%%/common/options_checkbox.png
+%%DATADIR%%/common/options_checkbox_checked.png
+%%DATADIR%%/common/options_checkbox_xed.png
+%%DATADIR%%/common/options_connections.png
+%%DATADIR%%/common/options_editors.png
+%%DATADIR%%/common/options_general.png
+%%DATADIR%%/common/options_querybrowser.png
+%%DATADIR%%/common/plus.png
+%%DATADIR%%/common/preferences.glade
+%%DATADIR%%/common/progress_indicator.gif
+%%DATADIR%%/common/sakila.png
+%%DATADIR%%/common/schema_32x32.png
+%%DATADIR%%/common/sizer_h_left.png
+%%DATADIR%%/common/sizer_h_right.png
+%%DATADIR%%/common/source_dbconn.png
+%%DATADIR%%/common/spin1.png
+%%DATADIR%%/common/spin2.png
+%%DATADIR%%/common/spin3.png
+%%DATADIR%%/common/spin4.png
+%%DATADIR%%/common/statusbar_clear.png
+%%DATADIR%%/common/tab_close.png
+%%DATADIR%%/common/tab_close_normal.png
+%%DATADIR%%/common/tab_close_over.png
+%%DATADIR%%/common/tab_close_pressed.png
+%%DATADIR%%/common/tab_list.png
+%%DATADIR%%/common/tab_new.png
+%%DATADIR%%/common/table_editor.glade
+%%DATADIR%%/common/tabsheet_icon_close.png
+%%DATADIR%%/common/tabsheet_icon_close2.png
+%%DATADIR%%/common/target_dbconn.png
+%%DATADIR%%/common/task_checked.png
+%%DATADIR%%/common/task_disabled.png
+%%DATADIR%%/common/task_error.png
+%%DATADIR%%/common/task_unchecked.png
+%%DATADIR%%/common/thread_stop.png
+%%DATADIR%%/common/tree_button_box.png
+%%DATADIR%%/common/tree_button_closed.png
+%%DATADIR%%/common/tree_button_open.png
+%%DATADIR%%/common/user_icon.png
+%%DATADIR%%/common/xgrtsh_about.png
+
+@comment MySQL-Administrator
+%%ADMINISTRATOR%%bin/mabackup
+%%ADMINISTRATOR%%bin/mysql-administrator
+%%ADMINISTRATOR%%bin/mysql-administrator-bin
+%%ADMINISTRATOR%%%%DATADIR%%/MySQLIcon_Admin_16x16.png
+%%ADMINISTRATOR%%%%DATADIR%%/MySQLIcon_Admin_32x32.png
+%%ADMINISTRATOR%%%%DATADIR%%/MySQLIcon_Admin_48x48.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Backup.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Catalog.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_CatalogOnTreeBG.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_CatalogTreeBG.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_DBConfig.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_DBModel.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_DBServer.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Database.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Field.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Health.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Index.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_KeyColumn.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Logs.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Replication.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Right.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_ServerConfig.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_ServerParams.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_ServerStartupParams.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_ServerThreads.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_StartStopService.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Statistics.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_StoredInDB.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_StoredProc.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Table.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Thread.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_User.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_UserAdmin.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_Users.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_View.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_error.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_start.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/16x16_warning.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Backup.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Catalog.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_DBConfig.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_DBModel.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_DBServer.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Database.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Field.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Health.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Index.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Logs.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Replication.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Right.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_ServerConfig.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_ServerParams.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_ServerStartupParams.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_ServerThreads.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_StartStopService.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Statistics.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_StoredInDB.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_StoredProc.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Table.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Thread.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_User.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_UserAdmin.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/24x24_Users.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/about.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/admin_preferences.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/backup.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/backup.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/backup_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/catalogs.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/catalogs.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/catalogs_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/connect_header_admin.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/disk_level_bg.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/disk_level_fg.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/health.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/health.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/health_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/health_level_bg.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/health_level_fg.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/innodb_data_file.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/main_window.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/merlin_advisors_sticker.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/merlin_alerts.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/merlin_graphs_sticker.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/merlin_grid_graph.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqladmin_health.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqladmin_startup_variables_description.dtd
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqladmin_startup_variables_description.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqladmin_status_variables.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqladmin_system_variables.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqlx_translations_administrator.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/mysqlx_translations_general.xml
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/option_checked.xpm
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/option_checked_light.xpm
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/option_crossed.xpm
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/option_unchecked.xpm
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/replication.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/replication_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/replication_status.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/restore.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/restore.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/restore_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_connections.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_connections.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_connections_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_info.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_info_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_information.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_logs.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_logs.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/server_logs_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_config.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_config_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_control.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_pause.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_start.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_status_paused.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_status_running.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_status_stopped.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/service_stop.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/startup_parameters.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/startup_variables.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/startup_variables_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/user_admin.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/user_admin_gray.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/user_administration.glade
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/variable.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/variable_disabled.png
+%%ADMINISTRATOR%%%%DATADIR%%/administrator/variable_editable.png
+%%ADMINISTRATOR%%share/applications/MySQLAdministrator.desktop
+
+@comment MySQL Query Browser
+%%QUERY_BROWSER%%bin/mysql-query-browser
+%%QUERY_BROWSER%%bin/mysql-query-browser-bin
+%%QUERY_BROWSER%%%%DATADIR%%/MySQLIcon_QueryBrowser_16x16.png
+%%QUERY_BROWSER%%%%DATADIR%%/MySQLIcon_QueryBrowser_32x32.png
+%%QUERY_BROWSER%%%%DATADIR%%/MySQLIcon_QueryBrowser_48x48.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/16x16_KeyColumn.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_AddRS.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_AddScript.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_DelSplit.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_DelTab.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_SplitHorizont.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/TabSheetPopup_SplitVertical.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/about.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/bookmark_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/compare_toolbar.glade
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/connect_header_qb.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/dolphin_anim.gif
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/folder_closed_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/folder_open_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/function_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/gutter_breakpoint.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/gutter_current_pos.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/gutter_query_start.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/history_interval_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/label_extra.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/label_extra_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/main.css
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysql.lang
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_bookmark_sample.xml
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_functions.html
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_functions.xml
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_history_sample.xml
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_quickstart.html
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_statements.html
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/mysqlqb_statements.xml
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/overlay_table_menu.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/param_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_browser.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_browser_active.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_browser_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_cmd.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_cmd_active.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_cmd_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_scripts.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_scripts_active.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_scripts_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_storedproc.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_storedproc_active.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/perspective_storedproc_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/qb_preferences.glade
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query-browser.rc
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_back.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_back_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_browser.glade
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_execute.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_execute_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_next.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_next_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_refresh.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_refresh_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_stop.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/query_stop_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_apply.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_apply_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_discard.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_discard_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_edit.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_edit_active.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_edit_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_error.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_first.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_first_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_last.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_last_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_notice.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_search.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_search_disabled.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/rs_warning.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/sakila.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_continue.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_continue_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_execute.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_execute_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_load.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_load_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_redo.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_redo_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_restart.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_restart_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_save.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_save_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_search.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_search_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_into.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_into_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_over.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_over_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_return.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_step_return_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_stop.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_stop_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_undo.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/script_undo_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_back.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_back_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_commit.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_commit_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_compare.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_compare_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_execute.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_execute_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_explain.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_explain_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_next.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_next_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_refresh.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_refresh_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_rollback.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_rollback_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_start.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_start_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_stop.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_query_stop_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_continue.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_continue_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_execute.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_execute_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_load.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_load_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_redo.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_redo_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_restart.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_restart_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_save.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_save_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_search.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_search_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_into.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_into_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_over.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_over_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_return.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_step_return_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_stop.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_stop_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_undo.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/small_script_undo_down.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/sql_create_view.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/syntax_14x14.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_close1.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_close2.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_close3.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_inlinehelp.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_resultset.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/tabsheet_icon_script.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/toolbar_bg1.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/toolbar_bg2.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/trans_commited.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/trans_rolledback.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/trans_started.png
+%%QUERY_BROWSER%%%%DATADIR%%/query-browser/workarea.glade
+%%QUERY_BROWSER%%share/applications/MySQLQueryBrowser.desktop
+
+@comment Directories
+%%ADMINISTRATOR%%@dirrm %%DATADIR%%/administrator
+%%QUERY_BROWSER%%@dirrm %%DATADIR%%/query-browser
+@dirrm %%DATADIR%%/common
+@dirrm %%DATADIR%%