kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 1.0.14

Browse source 
Thanks to Andrej Zverev (az[at]inec[dot]ru) for help.
This commit is contained in:
Sergey Matveychuk 2004-11-06 17:47:01 +00:00
parent f598a7e179
commit c8551063b9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=120978
9 changed files with 95 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
databases/mysql-administrator/Makefile
View file

@ -6,11 +6,9 @@
#
PORTNAME= mysql-administrator
PORTVERSION= 1.0.2b.a
PORTREVISION= 1
PORTVERSION= 1.0.14
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/%SUBDIR%/ \
http://www.softagency.co.jp/MySQL/%SUBDIR%/ \
MASTER_SITES= http://www.softagency.co.jp/MySQL/%SUBDIR%/ \
ftp://sunsite.dk/mirrors/mysql/%SUBDIR%/ \
http://mysql.mediatraffic.fi/%SUBDIR%/ \
ftp://filepile.tiscali.de/mirror/mysql/%SUBDIR%/ \
@ -19,7 +17,6 @@ MASTER_SITES= ftp://planetmirror.com/pub/mysql/%SUBDIR%/ \
ftp://ftp.u-paris10.fr/mysql.com/%SUBDIR%/ \
http://mysql.oms-net.nl/%SUBDIR%/
MASTER_SITE_SUBDIR= Downloads/MySQLAdministrationSuite
DISTNAME= ${PORTNAME}-1.0.2b-alpha
MAINTAINER= sem@FreeBSD.org
COMMENT= Powerful visual administration console for MySQL environment
@ -27,32 +24,33 @@ COMMENT= Powerful visual administration console for MySQL environment
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
WANT_AUTOMAKE_VER= 14
WANT_AUTOCONF_VER= 259
CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome
USE_ICONV= yes
USE_GNOME= libglade2
USE_GNOME= libglade2 gnomehack
USE_MYSQL= yes
BROKEN_WITH_MYSQL= 323
BROKEN_WITH_MYSQL= 323 40
GNU_CONFIGURE= yes
LIB_DEPENDS+= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
pcre.0:${PORTSDIR}/devel/pcre
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
RUN_DEPENDS= ${BUILD_DEPENDS}
DIRS_ORDER= mysql-gui-common mysql-administrator
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Does not compile on FreeBSD >= 5.x"
.endif
post-patch:
@${REINPLACE_CMD} -e "s#%%PTHREAD_CFLAGS%%#${PTHREAD_CFLAGS}#" \
${WRKSRC}/mysql-administrator/source/linux/Makefile.am
@${CHMOD} a+x ${WRKSRC}/mysql-gui-common/missing \
${WRKSRC}/mysql-administrator/missing
@${REINPLACE_CMD} -e 's#$$(datadir)/omf#$$(datadir)/gnome#' \
${WRKSRC}/mysql-administrator/omf.make
do-configure:
@${DO_NADA}
@ -64,10 +62,6 @@ do-build:
${ECHO_MSG} "---> Building: $${d}"; \
${ECHO_MSG} "--->"; \
cd ${WRKSRC}/$${d}; \
${AUTOMAKE} --foreign; ${AUTOCONF}; \
${CP} -f ${TEMPLATES}/config.sub ./config.sub; \
${CP} -f ${TEMPLATES}/config.guess ./config.guess; \
${CHMOD} a+rx ./config.sub; \
${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
${GMAKE} DATADIRNAME=share; \
done

4
databases/mysql-administrator/distinfo
View file

@ -1,2 +1,2 @@
MD5 (mysql-administrator-1.0.2b-alpha.tar.gz) = b453a947c57d35d724617bea485a266e
SIZE (mysql-administrator-1.0.2b-alpha.tar.gz) = 7452449
MD5 (mysql-administrator-1.0.14.tar.gz) = 80cf9922eec79175680f495db05e49d9
SIZE (mysql-administrator-1.0.14.tar.gz) = 4292913

11
databases/mysql-administrator/files/patch-Makefile.am Normal file
View file

@ -0,0 +1,11 @@
--- mysql-gui-common/library/source/Makefile.am.orig Wed Nov 3 01:28:52 2004
+++ mysql-gui-common/library/source/Makefile.am Sat Nov 6 17:35:25 2004
@@ -5,7 +5,7 @@
INCLUDES= -Wall -Wsign-compare\
-I../include -I../shared_include -I../public_interface/linux\
- @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@
+ @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ -D__USE_POSIX
test_SOURCES=test.c

11
databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am
View file

@ -1,11 +0,0 @@
--- mysql-gui-common/library/source/Makefile.am.orig Thu Apr 1 00:34:03 2004
+++ mysql-gui-common/library/source/Makefile.am Thu Apr 1 00:33:32 2004
@@ -2,7 +2,7 @@
noinst_LIBRARIES = libmysqlx.a
INCLUDES= -I../include -I../public_interface/linux\
- @MYSQL_INCLUDE@ @GLIB_CFLAGS@
+ @MYSQL_INCLUDE@ @GLIB_CFLAGS@ -D__USE_POSIX
libmysqlx_a_SOURCES=\

46
databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c
View file

@ -1,46 +0,0 @@
--- mysql-gui-common/library/source/myx_library.c.orig Sat Mar 20 21:58:39 2004
+++ mysql-gui-common/library/source/myx_library.c Sat Mar 20 22:12:51 2004
@@ -35,6 +35,7 @@
#endif
typedef long long longlong;
typedef unsigned long long ulonglong;
+typedef int pchar;
#else
typedef unsigned int uint;
typedef unsigned char uint8;
@@ -306,7 +307,7 @@
machine_info->IP= malloc(sizeof(char)*16);
machine_info->OS= malloc(sizeof(char)*16);
machine_info->hardware= malloc(sizeof(char)*200);
-
+/*
if(mysql->options.protocol==MYSQL_PROTOCOL_MEMORY)
{
add_host_info= strdup("via shared memory");
@@ -320,14 +321,14 @@
add_host_info= strdup("via named pipe");
}
else if(mysql->options.protocol==MYSQL_PROTOCOL_TCP)
- {
+ {*/
add_host_info= strdup("via TCP/IP");
- }
+/* }
else
{
add_host_info= strdup("");
}
-
+*/
sprintf(machine_info->version, "MySQL %s %s", (unsigned char *)mysql_get_server_info(mysql), add_host_info);
free(add_host_info);
@@ -482,7 +483,7 @@
const char * myx_get_server_charset_name(MYSQL *mysql)
{
- return mysql->charset->csname;
+ return mysql->charset->name;
}

10
databases/mysql-administrator/files/patch-myx_aux_functions.h Normal file
View file

@ -0,0 +1,10 @@
--- mysql-gui-common/library/include/myx_aux_functions.h.orig Sat Nov 6 20:07:35 2004
+++ mysql-gui-common/library/include/myx_aux_functions.h Sat Nov 6 20:08:03 2004
@@ -18,6 +18,7 @@
#define myx_aux_functions_h
#include <sys/types.h>
+#include <sys/time.h>
#include <string.h>
#include <errno.h>

14
databases/mysql-administrator/files/patch-myx_grt_private.c Normal file
View file

@ -0,0 +1,14 @@
--- mysql-gui-common/library_grt/source/myx_grt_private.c.orig Sat Nov 6 20:21:40 2004
+++ mysql-gui-common/library_grt/source/myx_grt_private.c Sat Nov 6 20:22:02 2004
@@ -47,8 +47,10 @@
int myx_grt_printf(MYX_GRT *grt, const char *fmt, ...)
{
va_list args;
+ char *tmp;
+
va_start(args, fmt);
- char *tmp= g_strdup_vprintf(fmt, args);
+ tmp= g_strdup_vprintf(fmt, args);
va_end(args);
MYX_PRINT(grt, tmp);

10
databases/mysql-administrator/files/patch-myx_ser_aux_functions.c Normal file
View file

@ -0,0 +1,10 @@
--- mysql-gui-common/library/source/myx_ser_aux_functions.c.orig Sat Aug 28 00:20:08 2004
+++ mysql-gui-common/library/source/myx_ser_aux_functions.c Sat Aug 28 00:20:31 2004
@@ -18,6 +18,7 @@
#include <glib.h>
#include <string.h>
#include <stdio.h>
+#include <sys/types.h>
#include <sys/socket.h>
struct _MYX_SFD

46
databases/mysql-administrator/pkg-plist
View file

@ -1,4 +1,5 @@
bin/mysql-administrator
bin/mysql-administrator-bin
share/applications/MySQLAdministrator.desktop
share/mysql-gui/MySQLIcon_Admin_16x16.png
share/mysql-gui/MySQLIcon_Admin_32x32.png
@ -59,7 +60,8 @@ share/mysql-gui/administrator/24x24_Thread.png
share/mysql-gui/administrator/24x24_User.png
share/mysql-gui/administrator/24x24_UserAdmin.png
share/mysql-gui/administrator/24x24_Users.png
share/mysql-gui/administrator/about_bg.jpg
share/mysql-gui/administrator/about.png
share/mysql-gui/administrator/admin_preferences.glade
share/mysql-gui/administrator/backup.glade
share/mysql-gui/administrator/backup.png
share/mysql-gui/administrator/backup_gray.png
@ -75,11 +77,11 @@ share/mysql-gui/administrator/health_level_bg.png
share/mysql-gui/administrator/health_level_fg.png
share/mysql-gui/administrator/innodb_data_file.glade
share/mysql-gui/administrator/main_window.glade
share/mysql-gui/administrator/mysqlx_health.xml
share/mysql-gui/administrator/mysqlx_startup_variables_description.dtd
share/mysql-gui/administrator/mysqlx_startup_variables_description.xml
share/mysql-gui/administrator/mysqlx_status_variables.xml
share/mysql-gui/administrator/mysqlx_system_variables.xml
share/mysql-gui/administrator/mysqladmin_health.xml
share/mysql-gui/administrator/mysqladmin_startup_variables_description.dtd
share/mysql-gui/administrator/mysqladmin_startup_variables_description.xml
share/mysql-gui/administrator/mysqladmin_status_variables.xml
share/mysql-gui/administrator/mysqladmin_system_variables.xml
share/mysql-gui/administrator/mysqlx_translations_administrator.xml
share/mysql-gui/administrator/mysqlx_translations_general.xml
share/mysql-gui/administrator/option_checked.xpm
@ -117,14 +119,42 @@ share/mysql-gui/administrator/user_admin.png
share/mysql-gui/administrator/user_admin_gray.png
share/mysql-gui/administrator/user_administration.glade
share/mysql-gui/administrator/variable.png
share/mysql-gui/administrator/variable_editable.png
share/mysql-gui/administrator/variable_disabled.png
share/mysql-gui/administrator/variable_editable.png
share/mysql-gui/common/16x16_Catalog.png
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/blob_icon.png
share/mysql-gui/common/busy.gif
share/mysql-gui/common/busy.png
share/mysql-gui/common/connect_dialog.glade
share/mysql-gui/common/connect_to_instance.png
share/mysql-gui/common/datatype_blob.png
share/mysql-gui/common/datatype_datetime.png
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_logo.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
share/mysql-gui/common/field_overlay_edit.png
share/mysql-gui/common/field_overlay_load.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/magnify_glass.png
share/mysql-gui/common/magnify_glass_with_popup.png
share/mysql-gui/common/mysql_logo.png
share/mysql-gui/common/mysqlx_dbm_charsets.xml
share/mysql-gui/common/mysqlx_dbm_datatypes.xml
share/mysql-gui/common/myx_schema_16x16.png
share/mysql-gui/common/myx_schema_sp_16x16.png
share/mysql-gui/common/myx_schema_table_16x16.png
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
@ -132,8 +162,8 @@ share/mysql-gui/common/options_connections.png
share/mysql-gui/common/options_general.png
share/mysql-gui/common/preferences.glade
share/mysql-gui/common/progress_indicator.gif
share/mysql-gui/common/table_editor.glade
share/mysql-gui/common/thread_stop.png
@dirrm share/mysql-gui/common
@dirrm share/mysql-gui/administrator
@dirrm share/mysql-gui
@dirrm share/applications