cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update mysql-gui-common with the new bundle from mysqlt-gui-tools-5.0r4

Browse Source
This commit is contained in:
wilfried 2006-10-18 14:23:55 +00:00
parent 807f853dde
commit 34942e1a07
8 changed files with 264 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
devel/mysql-gui-common/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2006/01/17 09:26:19 steven Exp $
# $OpenBSD: Makefile,v 1.4 2006/10/18 14:23:55 wilfried Exp $
COMMENT= "common libraries and data for the MySQL GUI Suites"
DISTNAME= mysql-query-browser-1.1.17
PKGNAME= mysql-gui-common-2.0.11betap0
DISTNAME= mysql-gui-tools-5.0r4
PKGNAME= mysql-gui-common-5.0.6.1
CATEGORIES= devel
HOMEPAGE= http://www.mysql.com/products/tools/administrator/
@ -16,10 +16,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQLAdministrationSuite/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQLAdministrationSuite/ \
ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQLAdministrationSuite/ \
ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQLAdministrationSuite/
MASTER_SITES= ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQLGUITools/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQLGUITools/ \
ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/ \
ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQLGUITools/
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
::devel/gettext \
@ -32,23 +32,29 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--disable-dependency-tracking
WRKDIST= ${WRKDIR}/mysql-query-browser-1.1.17/mysql-gui-common
WRKDIST= ${WRKDIR}/${DISTNAME}/mysql-gui-common
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/source/linux
${INSTALL_DATA} ${WRKSRC}/source/linux/*.[ah] ${PREFIX}/share/mysql-gui/common/source/linux
.for dir in source/linux \
library/base-library/include \
library/utilities/include \
library/utilities/shared_include
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/${dir}
${INSTALL_DATA} ${WRKSRC}/${dir}/*.h ${PREFIX}/share/mysql-gui/common/${dir}/
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/library/include
${INSTALL_DATA} ${WRKSRC}/library/include/* ${PREFIX}/share/mysql-gui/common/library/include
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/library/shared_include
${INSTALL_DATA} ${WRKSRC}/library/shared_include/* ${PREFIX}/share/mysql-gui/common/library/shared_include
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/library/source/
${INSTALL_DATA} ${WRKSRC}/library/source/libmysqlx.a ${PREFIX}/share/mysql-gui/common/library/source/
.for dir in source/linux \
library/base-library/source/.libs \
library/mysql-resultset/source/.libs \
library/sql-parser/source/.libs \
library/utilities/source/.libs
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql-gui/common/${dir}
${INSTALL_DATA} ${WRKSRC}/${dir}/*.a ${PREFIX}/share/mysql-gui/common/${dir}/
.endfor
.include <bsd.port.mk>

8
devel/mysql-gui-common/distinfo
View File

@ -1,4 +1,4 @@
MD5 (mysql-query-browser-1.1.17.tar.gz) = 21049084207781314297bfab93ba6fc6
RMD160 (mysql-query-browser-1.1.17.tar.gz) = b59763ef4844be6291ca3ae8cd43a5636df3adbd
SHA1 (mysql-query-browser-1.1.17.tar.gz) = 07768c00a936f75bed1581411ec06f24db23b1d1
SIZE (mysql-query-browser-1.1.17.tar.gz) = 12524409
MD5 (mysql-gui-tools-5.0r4.tar.gz) = 2ea9381174c19942cf0976ded88fea17
RMD160 (mysql-gui-tools-5.0r4.tar.gz) = e31f297f92a044c76122adc5d6a3b8d45005b4bf
SHA1 (mysql-gui-tools-5.0r4.tar.gz) = a85b86d93bceb3f62edc5d6edbca80bc9eebab8f
SIZE (mysql-gui-tools-5.0r4.tar.gz) = 22666771

13
devel/mysql-gui-common/patches/patch-library_include_myx_aux_functions_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-library_include_myx_aux_functions_h,v 1.1.1.1 2005/11/04 13:58:34 wilfried Exp $
--- library/include/myx_aux_functions.h.orig Tue Oct 11 20:11:29 2005
+++ library/include/myx_aux_functions.h Fri Nov 4 11:43:39 2005
@@ -97,9 +97,6 @@ extern "C" {
typedef short int16;
typedef unsigned long uint32;
typedef long int32;
- #ifndef __GLIBC__
- typedef unsigned long ulong;
- #endif
typedef long long longlong;
typedef unsigned long long ulonglong;

13
devel/mysql-gui-common/patches/patch-library_utilities_include_myx_util_functions_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-library_utilities_include_myx_util_functions_h,v 1.1 2006/10/18 14:23:56 wilfried Exp $
--- library/utilities/include/myx_util_functions.h.orig Wed Sep 20 17:26:07 2006
+++ library/utilities/include/myx_util_functions.h Tue Oct 17 16:49:35 2006
@@ -108,9 +108,6 @@ extern "C" {
typedef short int16;
typedef unsigned long uint32;
typedef long int32;
- #ifndef __GLIBC__
- typedef unsigned long ulong;
- #endif
typedef long long longlong;
typedef unsigned long long ulonglong;
#endif

49
devel/mysql-gui-common/patches/patch-library_source_myx_aux_functions_c → devel/mysql-gui-common/patches/patch-library_utilities_source_myx_util_functions_c
View File

@ -1,22 +1,20 @@
$OpenBSD: patch-library_source_myx_aux_functions_c,v 1.1.1.1 2005/11/04 13:58:34 wilfried Exp $
--- library/source/myx_aux_functions.c.orig Fri Oct 7 22:14:34 2005
+++ library/source/myx_aux_functions.c Fri Nov 4 11:48:45 2005
@@ -44,7 +44,12 @@
$OpenBSD: patch-library_utilities_source_myx_util_functions_c,v 1.1 2006/10/18 14:23:56 wilfried Exp $
--- library/utilities/source/myx_util_functions.c.orig Wed Sep 20 17:26:07 2006
+++ library/utilities/source/myx_util_functions.c Wed Oct 18 11:59:33 2006
@@ -52,6 +52,10 @@
# include <sys/types.h>
# include <sys/stat.h>
# include <unistd.h>
+
+#if defined (__OpenBSD__)
+# include <sys/param.h>
+# include <sys/sysctl.h>
+# if defined (__OpenBSD__)
+# include <sys/param.h>
+# include <sys/sysctl.h>
+# endif
#endif
+#endif
// MacOS X
#if defined(__APPLE__) && defined(__MACH__)
@@ -1281,6 +1286,55 @@ static int _get_hardware_info(char **cpu
return 0;
}
@@ -1323,7 +1327,56 @@ static int _get_hardware_info(char **cpu
//----------------------------------------------------------------------------------------------------------------------
+#elif defined (__OpenBSD__)
+static int _get_hardware_info(char **cpu, char **clock, int *cpu_count, unsigned long *mem_kb)
@ -36,7 +34,7 @@ $OpenBSD: patch-library_source_myx_aux_functions_c,v 1.1.1.1 2005/11/04 13:58:34
+ *cpu = g_strdup(p);
+ free(p);
+ }
+#else
#else
+ *cpu = g_strdup("");
+#endif
+
@ -67,6 +65,27 @@ $OpenBSD: patch-library_source_myx_aux_functions_c,v 1.1.1.1 2005/11/04 13:58:34
+
+ return 0;
+}
#else
+#else
// Linux
static int _get_hardware_info(char **cpu, char **clock, int *cpu_count, unsigned long *mem_kb)
{
@@ -1562,6 +1615,19 @@ bigint get_physical_memory_size()
}
return mem64;
+#elif defined (__OpenBSD__)
+ bigint mem64 = 0;
+ int mib[2];
+ size_t len;
+ int val;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM;
+ len = sizeof(val);
+ if (sysctl(mib, 2, &val, &len, NULL, 0) != -1)
+ mem64 = val;
+
+ return mem64;
#else
FILE *proc;
bigint mem64;

23
devel/mysql-gui-common/patches/patch-source_linux_MGExecSU_cc Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-source_linux_MGExecSU_cc,v 1.1 2006/10/18 14:23:56 wilfried Exp $
--- source/linux/MGExecSU.cc.orig Tue Oct 17 16:59:35 2006
+++ source/linux/MGExecSU.cc Tue Oct 17 17:01:32 2006
@@ -4,11 +4,19 @@
#include "myg_utils.h"
#include "myg_gtkutils.h"
#include "mygpriv.h"
+#if defined(__OpenBSD__)
+#include <signal.h>
+#else
#include <sys/signal.h>
+#endif
#include <sys/wait.h>
#include <stdio.h>
#include <stdlib.h>
+#if defined(__OpenBSD__)
+#include <util.h>
+#else
#include <pty.h>
+#endif
#include <fcntl.h>

2
devel/mysql-gui-common/pkg/DESCR
View File

@ -1,2 +1,2 @@
This contains several common libraries and data shared among the
MySQL GUI Suites.
MySQL GUI Tools.

126
devel/mysql-gui-common/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/04 13:58:34 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/10/18 14:23:56 wilfried Exp $
share/mysql-gui/
share/mysql-gui/common/
share/mysql-gui/common/16x16_Catalog.png
@ -6,9 +6,22 @@ share/mysql-gui/common/16x16_Database.png
share/mysql-gui/common/16x16_Field.png
share/mysql-gui/common/16x16_KeyColumn.png
share/mysql-gui/common/16x16_Table.png
share/mysql-gui/common/16x16_User.png
share/mysql-gui/common/16x16_Users.png
share/mysql-gui/common/asset_index.png
share/mysql-gui/common/asset_index_16x16.png
share/mysql-gui/common/asset_table.png
share/mysql-gui/common/asset_table_16x16.png
share/mysql-gui/common/auth_dialog.glade
share/mysql-gui/common/blob_icon.png
share/mysql-gui/common/busy.gif
share/mysql-gui/common/busy.png
share/mysql-gui/common/checkmark.png
share/mysql-gui/common/column.png
share/mysql-gui/common/column_11x11.png
share/mysql-gui/common/column_fk.png
share/mysql-gui/common/column_fk_11x11.png
share/mysql-gui/common/column_pk.png
share/mysql-gui/common/column_pk_11x11.png
share/mysql-gui/common/connect_dialog.glade
share/mysql-gui/common/connect_to_instance.png
share/mysql-gui/common/datatype_blob.png
@ -17,7 +30,10 @@ share/mysql-gui/common/datatype_numeric.png
share/mysql-gui/common/datatype_spatial.png
share/mysql-gui/common/datatype_string.png
share/mysql-gui/common/datatype_userdefined.png
share/mysql-gui/common/dockpnl_bg.png
share/mysql-gui/common/dockpnl_bg_logo.png
share/mysql-gui/common/edit_disabled.png
share/mysql-gui/common/edit_enabled.png
share/mysql-gui/common/editor_table_auto_inc.png
share/mysql-gui/common/editor_table_not_null.png
share/mysql-gui/common/field_overlay_clear.png
@ -27,28 +43,68 @@ share/mysql-gui/common/field_overlay_null.png
share/mysql-gui/common/field_overlay_save.png
share/mysql-gui/common/field_overlay_view.png
share/mysql-gui/common/folder_16x16.png
share/mysql-gui/common/grt_routines_editor.glade
share/mysql-gui/common/grt_schema_editor.glade
share/mysql-gui/common/grt_table_editor.glade
share/mysql-gui/common/grt_view_editor.glade
share/mysql-gui/common/how_to_translate.txt
share/mysql-gui/common/library/
share/mysql-gui/common/library/include/
share/mysql-gui/common/library/include/myx_aux_functions.h
share/mysql-gui/common/library/include/myx_const_string.h
share/mysql-gui/common/library/include/myx_library.h
share/mysql-gui/common/library/include/myx_network.h
share/mysql-gui/common/library/include/myx_public_interface.h
share/mysql-gui/common/library/include/myx_query.h
share/mysql-gui/common/library/include/myx_query_reader.h
share/mysql-gui/common/library/include/myx_recordset.h
share/mysql-gui/common/library/include/myx_ser_aux_functions.h
share/mysql-gui/common/library/include/myx_simple_sql_parsing.h
share/mysql-gui/common/library/include/myx_xml_aux_functions.h
share/mysql-gui/common/library/shared_include/
share/mysql-gui/common/library/shared_include/myx_shared_aux_functions.h
share/mysql-gui/common/library/source/
share/mysql-gui/common/library/source/libmysqlx.a
share/mysql-gui/common/library/base-library/
share/mysql-gui/common/library/base-library/include/
share/mysql-gui/common/library/base-library/include/myx_const_string.h
share/mysql-gui/common/library/base-library/include/myx_library.h
share/mysql-gui/common/library/base-library/include/myx_network.h
share/mysql-gui/common/library/base-library/include/myx_public_interface.h
share/mysql-gui/common/library/base-library/include/myx_query.h
share/mysql-gui/common/library/base-library/include/myx_query_reader.h
share/mysql-gui/common/library/base-library/include/myx_recordset.h
share/mysql-gui/common/library/base-library/include/myx_ser_aux_functions.h
share/mysql-gui/common/library/base-library/include/myx_simple_sql_parsing.h
share/mysql-gui/common/library/base-library/source/
share/mysql-gui/common/library/base-library/source/.libs/
share/mysql-gui/common/library/base-library/source/.libs/libmysqlx.a
share/mysql-gui/common/library/mysql-resultset/
share/mysql-gui/common/library/mysql-resultset/source/
share/mysql-gui/common/library/mysql-resultset/source/.libs/
share/mysql-gui/common/library/mysql-resultset/source/.libs/libgrtsqlrs.a
share/mysql-gui/common/library/mysql-resultset/source/.libs/libsqlrs.a
share/mysql-gui/common/library/sql-parser/
share/mysql-gui/common/library/sql-parser/source/
share/mysql-gui/common/library/sql-parser/source/.libs/
share/mysql-gui/common/library/sql-parser/source/.libs/libsqlparser.a
share/mysql-gui/common/library/utilities/
share/mysql-gui/common/library/utilities/include/
share/mysql-gui/common/library/utilities/include/entities.h
share/mysql-gui/common/library/utilities/include/keywords.h
share/mysql-gui/common/library/utilities/include/myx_international_file.h
share/mysql-gui/common/library/utilities/include/myx_util.h
share/mysql-gui/common/library/utilities/include/myx_util_functions.h
share/mysql-gui/common/library/utilities/include/myx_util_public_interface.h
share/mysql-gui/common/library/utilities/include/myx_xml_util_functions.h
share/mysql-gui/common/library/utilities/shared_include/
share/mysql-gui/common/library/utilities/shared_include/myx_shared_util_functions.h
share/mysql-gui/common/library/utilities/source/
share/mysql-gui/common/library/utilities/source/.libs/
share/mysql-gui/common/library/utilities/source/.libs/libguiutil.a
share/mysql-gui/common/magnify_glass.png
share/mysql-gui/common/magnify_glass_with_popup.png
share/mysql-gui/common/messagedlg_confirmation.png
share/mysql-gui/common/messagedlg_edit.png
share/mysql-gui/common/messagedlg_error.png
share/mysql-gui/common/messagedlg_information.png
share/mysql-gui/common/messagedlg_warning.png
share/mysql-gui/common/mini_add.png
share/mysql-gui/common/mini_add_12.png
share/mysql-gui/common/mini_add_pressed.png
share/mysql-gui/common/mini_add_pressed_12.png
share/mysql-gui/common/mini_del.png
share/mysql-gui/common/mini_del_12.png
share/mysql-gui/common/mini_del_pressed.png
share/mysql-gui/common/mini_del_pressed_12.png
share/mysql-gui/common/mini_error.png
share/mysql-gui/common/mini_notice.png
share/mysql-gui/common/mini_warning.png
share/mysql-gui/common/minus.png
share/mysql-gui/common/mysql_logo.png
share/mysql-gui/common/mysqlx_dbm_charsets.xml
share/mysql-gui/common/mysqlx_dbm_datatypes.xml
@ -59,10 +115,20 @@ share/mysql-gui/common/myx_schema_view_16x16.png
share/mysql-gui/common/networkhost_16x16.png
share/mysql-gui/common/options_admin.png
share/mysql-gui/common/options_bg.png
share/mysql-gui/common/options_checkbox.png
share/mysql-gui/common/options_checkbox_checked.png
share/mysql-gui/common/options_checkbox_xed.png
share/mysql-gui/common/options_connections.png
share/mysql-gui/common/options_editors.png
share/mysql-gui/common/options_general.png
share/mysql-gui/common/options_querybrowser.png
share/mysql-gui/common/plus.png
share/mysql-gui/common/preferences.glade
share/mysql-gui/common/progress_indicator.gif
share/mysql-gui/common/sakila.png
share/mysql-gui/common/schema_32x32.png
share/mysql-gui/common/sizer_h_left.png
share/mysql-gui/common/sizer_h_right.png
share/mysql-gui/common/source/
share/mysql-gui/common/source/linux/
share/mysql-gui/common/source/linux/MCrontab.h
@ -71,8 +137,10 @@ share/mysql-gui/common/source/linux/MGAboutPanel.h
share/mysql-gui/common/source/linux/MGBlobEditor.h
share/mysql-gui/common/source/linux/MGBrowserList.h
share/mysql-gui/common/source/linux/MGCellRenderer.h
share/mysql-gui/common/source/linux/MGCellRendererCombo.h
share/mysql-gui/common/source/linux/MGCharsetPickDialog.h
share/mysql-gui/common/source/linux/MGConnectDialog.h
share/mysql-gui/common/source/linux/MGExecSU.h
share/mysql-gui/common/source/linux/MGFileBrowserList.h
share/mysql-gui/common/source/linux/MGFloatingWidget.h
share/mysql-gui/common/source/linux/MGGladeXML.h
@ -80,6 +148,7 @@ share/mysql-gui/common/source/linux/MGGraphPlotter.h
share/mysql-gui/common/source/linux/MGHMeterGraphPlotter.h
share/mysql-gui/common/source/linux/MGIconPicker.h
share/mysql-gui/common/source/linux/MGImage.h
share/mysql-gui/common/source/linux/MGImageButton.h
share/mysql-gui/common/source/linux/MGImageCheckButton.h
share/mysql-gui/common/source/linux/MGMeterGraphPlotter.h
share/mysql-gui/common/source/linux/MGMySQLConsole.h
@ -89,6 +158,7 @@ share/mysql-gui/common/source/linux/MGPtrWrap.h
share/mysql-gui/common/source/linux/MGSQLTextBuffer.h
share/mysql-gui/common/source/linux/MGSchemaBrowserHelper.h
share/mysql-gui/common/source/linux/MGSchemaBrowserList.h
share/mysql-gui/common/source/linux/MGShellView.h
share/mysql-gui/common/source/linux/MGSimpleTreeStore.h
share/mysql-gui/common/source/linux/MGTableBrowserList.h
share/mysql-gui/common/source/linux/MGTableEditor.h
@ -102,5 +172,25 @@ share/mysql-gui/common/source/linux/myg_gtk_utils.h
share/mysql-gui/common/source/linux/myg_gtkutils.h
share/mysql-gui/common/source/linux/myg_utils.h
share/mysql-gui/common/source/linux/mygpriv.h
share/mysql-gui/common/source_dbconn.png
share/mysql-gui/common/statusbar_clear.png
share/mysql-gui/common/tab_close.png
share/mysql-gui/common/tab_close_normal.png
share/mysql-gui/common/tab_close_over.png
share/mysql-gui/common/tab_close_pressed.png
share/mysql-gui/common/tab_list.png
share/mysql-gui/common/tab_new.png
share/mysql-gui/common/table_editor.glade
share/mysql-gui/common/tabsheet_icon_close.png
share/mysql-gui/common/tabsheet_icon_close2.png
share/mysql-gui/common/target_dbconn.png
share/mysql-gui/common/task_checked.png
share/mysql-gui/common/task_disabled.png
share/mysql-gui/common/task_error.png
share/mysql-gui/common/task_unchecked.png
share/mysql-gui/common/thread_stop.png
share/mysql-gui/common/tree_button_box.png
share/mysql-gui/common/tree_button_closed.png
share/mysql-gui/common/tree_button_open.png
share/mysql-gui/common/user_icon.png
share/mysql-gui/common/xgrtsh_about.png