ports/65010: [MAINTAINER] databases/mysql-administrator: update to 1.0.2b-alpha
Sergey Matveychuk
sem at ciam.ru
Wed Mar 31 22:10:24 UTC 2004
>Number: 65010
>Category: ports
>Synopsis: [MAINTAINER] databases/mysql-administrator: update to 1.0.2b-alpha
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 31 14:10:21 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #5: Fri Mar 12 03:47:38 MSK 2004
>Description:
- Update to 1.0.2b-alpha
Added file(s):
- files/patch-mysql-gui-common::library::source::Makefile.am
- files/patch-mysql-gui-common::library::source::myx_library.c
Removed file(s):
- files/patch-4.x-fixes
- files/patch-mysqladministrator::configure.in
- files/patch-mysqladministrator::source::linux::MAServerLogsPanel.cc
- files/patch-mysqladministrator::source::linux::MDynamicInterface.cc
- files/patch-mysqladministrator::source::linux::MInstanceInfo.cc
- files/patch-mysqladministrator::source::linux::Makefile.am
- files/patch-mysqladministrator::source::linux::util.cc
- files/patch-mysqlcommonguiparts::configure.in
- files/patch-mysqlcommonguiparts::source::linux::MGConnectDialog.cc
- files/patch-mysqlcommonguiparts::source::linux::Makefile.am
- files/patch-mysqlxlibrary::source::Makefile.am
- files/patch-mysqlxlibrary::source::myx_library.c
- files/patch-mysqlxlibrary::source::myx_network.c
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- mysql-administrator-1.0.2b.a.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/Makefile /usr/ports/databases/mysql-administrator/Makefile
--- /usr/ports/databases/mysql-administrator.orig/Makefile Wed Mar 31 23:05:41 2004
+++ /usr/ports/databases/mysql-administrator/Makefile Thu Apr 1 00:59:42 2004
@@ -2,11 +2,11 @@
# Date created: 21 Febrary 2004
# Whom: Sergey Matveychuk <sem at ciam.ru>
#
-# $FreeBSD: ports/databases/mysql-administrator/Makefile,v 1.7 2004/03/28 06:58:16 kris Exp $
+# $FreeBSD: ports/databases/mysql-administrator/Makefile,v 1.6 2004/03/13 18:02:04 ade Exp $
#
PORTNAME= mysql-administrator
-PORTVERSION= 1.0.1a
+PORTVERSION= 1.0.2b.a
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/%SUBDIR%/ \
http://www.softagency.co.jp/MySQL/%SUBDIR%/ \
@@ -18,6 +18,7 @@
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 at ciam.ru
COMMENT= Powerful visual administration console for MySQL environment
@@ -27,28 +28,25 @@
USE_GMAKE= yes
WANT_AUTOMAKE_VER= 14
WANT_AUTOCONF_VER= 257
-LIBTOOLFILES=
CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-
+USE_ICONV= yes
USE_GNOME= libglade2
USE_MYSQL= yes
BROKEN_WITH_MYSQL= 323
-WRKSRC= ${WRKDIR}/${PORTNAME}
LIB_DEPENDS+= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
pcre.0:${PORTSDIR}/devel/pcre
-DIRS_ORDER= mysqlxlibrary mysqladministratorlibrary \
- mysqlcommonguiparts mysqladministrator
+DIRS_ORDER= mysql-gui-common mysql-administrator
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e "s#%%PTHREAD_CFLAGS%%#${PTHREAD_CFLAGS}#" \
- ${WRKSRC}/mysqladministrator/source/linux/Makefile.am
- @${CHMOD} a+x ${WRKSRC}/mysqlcommonguiparts/missing \
- ${WRKSRC}/mysqladministrator/missing
+ ${WRKSRC}/mysql-administrator/source/linux/Makefile.am
+ @${CHMOD} a+x ${WRKSRC}/mysql-gui-common/missing \
+ ${WRKSRC}/mysql-administrator/missing
do-configure:
@${DO_NADA}
@@ -65,7 +63,7 @@
${CP} -f ${TEMPLATES}/config.guess ./config.guess; \
${CHMOD} a+rx ./config.sub; \
${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
- ${GMAKE}; \
+ ${GMAKE} DATADIRNAME=share; \
done
do-install:
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/distinfo /usr/ports/databases/mysql-administrator/distinfo
--- /usr/ports/databases/mysql-administrator.orig/distinfo Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/distinfo Sat Mar 20 02:30:23 2004
@@ -1,2 +1,2 @@
-MD5 (mysql-administrator-1.0.1a.tar.gz) = 94790652f3900bd898cc6473edd0020e
-SIZE (mysql-administrator-1.0.1a.tar.gz) = 14064351
+MD5 (mysql-administrator-1.0.2b-alpha.tar.gz) = b453a947c57d35d724617bea485a266e
+SIZE (mysql-administrator-1.0.2b-alpha.tar.gz) = 7452449
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-4.x-fixes /usr/ports/databases/mysql-administrator/files/patch-4.x-fixes
--- /usr/ports/databases/mysql-administrator.orig/files/patch-4.x-fixes Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-4.x-fixes Thu Jan 1 03:00:00 1970
@@ -1,63 +0,0 @@
---- mysqlcommonguiparts/source/linux/MGConnectDialog.h.orig Tue Feb 24 03:23:47 2004
-+++ mysqlcommonguiparts/source/linux/MGConnectDialog.h Tue Feb 24 03:28:35 2004
-@@ -24,10 +24,16 @@
-
- #include "MGGladeXML.h"
-
--
- #include <myx_aux_functions.h>
- #include <myx_public_interface.h>
- //#include <wmyx_public_interface.h>
-+
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500000
-+#include <pthread.h>
-+#endif
-+#endif
-
-
- class MGPreferences;
---- mysqlcommonguiparts/source/linux/MGFileBrowserList.cc.orig Tue Feb 24 03:27:19 2004
-+++ mysqlcommonguiparts/source/linux/MGFileBrowserList.cc Tue Feb 24 03:27:39 2004
-@@ -20,6 +20,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <errno.h>
-+#include <stdio.h>
-
- #define _(s) s
-
---- mysqlcommonguiparts/source/linux/MGMeterGraphPlotter.cc.orig Tue Feb 24 03:29:27 2004
-+++ mysqlcommonguiparts/source/linux/MGMeterGraphPlotter.cc Tue Feb 24 03:29:44 2004
-@@ -17,7 +17,7 @@
-
- #include "MGMeterGraphPlotter.h"
-
--
-+#include <stdio.h>
-
- MGMeterGraphPlotter::MGMeterGraphPlotter(GtkDrawingArea *darea)
- : MGGraphPlotter(darea, false), _value(0)
---- mysqlcommonguiparts/source/linux/MGHMeterGraphPlotter.cc.orig Tue Feb 24 03:31:12 2004
-+++ mysqlcommonguiparts/source/linux/MGHMeterGraphPlotter.cc Tue Feb 24 03:31:29 2004
-@@ -17,7 +17,7 @@
-
- #include "MGHMeterGraphPlotter.h"
-
--
-+#include <stdio.h>
-
- MGHMeterGraphPlotter::MGHMeterGraphPlotter(GtkDrawingArea *darea)
- : MGGraphPlotter(darea, false), _current_value(0), _total_value(0), _unit(0)
---- mysqlcommonguiparts/source/linux/MGPreferences.cc.orig Tue Feb 24 03:31:54 2004
-+++ mysqlcommonguiparts/source/linux/MGPreferences.cc Tue Feb 24 03:32:23 2004
-@@ -20,6 +20,8 @@
- #include <glibmm.h>
-
- #include <sys/stat.h>
-+#include <stdio.h>
-+#include <errno.h>
-
- #define _(s) s
-
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysql-gui-common::library::source::Makefile.am /usr/ports/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysql-gui-common::library::source::Makefile.am Thu Jan 1 03:00:00 1970
+++ /usr/ports/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::Makefile.am Thu Apr 1 00:35:01 2004
@@ -0,0 +1,11 @@
+--- 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=\
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysql-gui-common::library::source::myx_library.c /usr/ports/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysql-gui-common::library::source::myx_library.c Thu Jan 1 03:00:00 1970
+++ /usr/ports/databases/mysql-administrator/files/patch-mysql-gui-common::library::source::myx_library.c Sat Mar 20 22:14:05 2004
@@ -0,0 +1,46 @@
+--- 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;
+ }
+
+
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::configure.in /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::configure.in
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::configure.in Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::configure.in Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- mysqladministrator/configure.in.orig Tue Feb 24 01:13:46 2004
-+++ mysqladministrator/configure.in Tue Feb 24 01:14:00 2004
-@@ -16,7 +16,7 @@
- # internal libraries
- #
- AC_CHECK_FILE(../mysqlxlibrary/include,
-- [MYSQLX_INCLUDE='-I$(top_srcdir)/../mysqlxlibrary/{include,public_interface/linux}'],
-+ [MYSQLX_INCLUDE='-I$(top_srcdir)/../mysqlxlibrary/include'],
- AC_MSG_ERROR([mysqlxlibrary source tree must be present in the same directory as this program]))
-
- AC_CHECK_FILE(../mysqlxlibrary/source/libMySQLX.a,
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MAServerLogsPanel.cc /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MAServerLogsPanel.cc
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MAServerLogsPanel.cc Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MAServerLogsPanel.cc Thu Jan 1 03:00:00 1970
@@ -1,24 +0,0 @@
---- mysqladministrator/source/linux/MAServerLogsPanel.cc.orig Wed Feb 11 22:38:41 2004
-+++ mysqladministrator/source/linux/MAServerLogsPanel.cc Tue Feb 24 03:56:22 2004
-@@ -21,7 +21,8 @@
- #include "MDataInterface.h"
-
- #include "myx_admin_public_interface.h"
--
-+#include <errno.h>
-+#include <math.h>
-
- #define PAGE_BLOCK_SIZE (1024*5)
-
-@@ -144,7 +145,11 @@
-
- void MAServerLogsPanel::scroll_log(LogType type)
- {
-+#if defined(__FreeBSD__)
-+ double val= floor(_sbar[type]->get_value());
-+#else
- double val= round(_sbar[type]->get_value());
-+#endif
- _sbar[type]->set_value(val);
-
- process_logs(type);
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MDynamicInterface.cc /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MDynamicInterface.cc
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MDynamicInterface.cc Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MDynamicInterface.cc Thu Jan 1 03:00:00 1970
@@ -1,26 +0,0 @@
---- mysqladministrator/source/linux/MDynamicInterface.cc.orig Tue Feb 24 03:46:44 2004
-+++ mysqladministrator/source/linux/MDynamicInterface.cc Tue Feb 24 03:51:45 2004
-@@ -21,7 +21,10 @@
- #include <ctype.h>
-
- #include <list>
--
-+#if defined (__FreeBSD__)
-+#include <errno.h>
-+#include <sys/param.h>
-+#endif
-
- MDynamicInterface::MDynamicInterface(Gtk::Notebook *top_note,
- const Glib::RefPtr<Gdk::Pixbuf> &icon,
-@@ -721,7 +724,11 @@
- else if (widget->default_value)
- value= (char*)widget->default_value;
- else
-+#if defined (__FreeBSD__) && __FreeBSD_version < 500000
-+ value="";
-+#else
- value.clear();
-+#endif
- set_option_value((char*)widget->id, value);
- }
- }
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MInstanceInfo.cc /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MInstanceInfo.cc
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::MInstanceInfo.cc Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::MInstanceInfo.cc Thu Jan 1 03:00:00 1970
@@ -1,18 +0,0 @@
---- mysqladministrator/source/linux/MInstanceInfo.cc.orig Wed Feb 11 22:38:41 2004
-+++ mysqladministrator/source/linux/MInstanceInfo.cc Tue Feb 24 03:45:50 2004
-@@ -24,9 +24,15 @@
- #include "myx_aux_functions.h"
- #include "myx_admin_public_interface.h"
-
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#else
- #include <sys/statfs.h>
- #include <sys/vfs.h>
-+#endif
- #include <stdio.h>
-+#include <errno.h>
-
- struct FSType {
- long id;
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::Makefile.am /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::Makefile.am
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::Makefile.am Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::Makefile.am Thu Jan 1 03:00:00 1970
@@ -1,14 +0,0 @@
---- mysqladministrator/source/linux/Makefile.am.orig Wed Feb 11 22:38:41 2004
-+++ mysqladministrator/source/linux/Makefile.am Tue Feb 24 04:14:39 2004
-@@ -26,9 +26,9 @@
- MADummyPanel.cc
-
-
--INCLUDES=@GNOME_CFLAGS@ @MYSQL_INCLUDE@ @AUX_CFLAGS@\
-+INCLUDES=@GNOME_CFLAGS@ @MYSQL_INCLUDE@ @AUX_CFLAGS@ %%PTHREAD_CFLAGS%% \
- -DDATADIR=\""$(mydatadir)"\"\
-- -DAPP_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-+ -DAPP_LOCALE_DIR=\""$(prefix)/share/locale"\"
-
-
- mysql_administrator_LDADD=@AUX_LIBS@ @MYSQL_LIBS@ @PCRE_LIBS@ @GNOME_LIBS@
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::util.cc /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::util.cc
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqladministrator::source::linux::util.cc Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqladministrator::source::linux::util.cc Thu Jan 1 03:00:00 1970
@@ -1,10 +0,0 @@
---- mysqladministrator/source/linux/util.cc.orig Tue Feb 24 03:52:32 2004
-+++ mysqladministrator/source/linux/util.cc Tue Feb 24 03:53:35 2004
-@@ -4,6 +4,7 @@
- #include "util.h"
- #include <glib.h>
- #include <stdarg.h>
-+#include <unistd.h>
-
- #include <myx_library.h>
-
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::configure.in /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::configure.in
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::configure.in Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::configure.in Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- mysqlcommonguiparts/configure.in.orig Tue Feb 24 01:12:59 2004
-+++ mysqlcommonguiparts/configure.in Tue Feb 24 01:13:27 2004
-@@ -8,7 +8,7 @@
-
-
- AC_CHECK_FILE(../mysqlxlibrary/include,
-- [MYSQLX_INCLUDE='-I$(top_srcdir)/../mysqlxlibrary/{include,public_interface/linux}'],
-+ [MYSQLX_INCLUDE='-I$(top_srcdir)/../mysqlxlibrary/include'],
- AC_MSG_ERROR([mysqlxlibrary source tree must be present in the same directory as this program]))
-
- AC_CHECK_FILE(../mysqlxlibrary/source/libMySQLX.a,
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::source::linux::MGConnectDialog.cc /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::source::linux::MGConnectDialog.cc
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::source::linux::MGConnectDialog.cc Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::source::linux::MGConnectDialog.cc Thu Jan 1 03:00:00 1970
@@ -1,10 +0,0 @@
---- mysqlcommonguiparts/source/linux/MGConnectDialog.cc.orig Sat Feb 21 17:59:02 2004
-+++ mysqlcommonguiparts/source/linux/MGConnectDialog.cc Sat Feb 21 17:59:37 2004
-@@ -19,6 +19,7 @@
- #include "myg_gtk_utils.h"
- #include "myg_utils.h"
- #include <stdarg.h>
-+#include <libintl.h>
-
- #include "MGPreferences.h"
-
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::source::linux::Makefile.am /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::source::linux::Makefile.am
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlcommonguiparts::source::linux::Makefile.am Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlcommonguiparts::source::linux::Makefile.am Thu Jan 1 03:00:00 1970
@@ -1,9 +0,0 @@
---- mysqlcommonguiparts/source/linux/Makefile.am.orig Sun Feb 22 04:25:16 2004
-+++ mysqlcommonguiparts/source/linux/Makefile.am Sun Feb 22 04:25:29 2004
-@@ -24,5 +24,5 @@
- INCLUDES=@GNOME_CFLAGS@ @MYSQL_INCLUDE@\
- @AUX_INCLUDES@\
- -DAPP_DATADIR=\""$(mydatadir)"\"\
-- -DAPP_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-+ -DAPP_LOCALE_DIR=\""$(prefix)/share/locale"\"
-
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::Makefile.am /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::Makefile.am
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::Makefile.am Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::Makefile.am Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- mysqlxlibrary/source/Makefile.am.orig Sun Feb 22 03:35:24 2004
-+++ mysqlxlibrary/source/Makefile.am Sun Feb 22 03:35:37 2004
-@@ -2,7 +2,7 @@
- noinst_LIBRARIES = libMySQLX.a
-
- INCLUDES= -I../include -I../public_interface/linux\
-- @MYSQL_INCLUDE@ @XML_CFLAGS@ @GLIB_CFLAGS@
-+ @MYSQL_INCLUDE@ @XML_CFLAGS@ @GLIB_CFLAGS@ -D__USE_POSIX
-
-
- libMySQLX_a_SOURCES=\
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::myx_library.c /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::myx_library.c
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::myx_library.c Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::myx_library.c Thu Jan 1 03:00:00 1970
@@ -1,14 +0,0 @@
---- mysqlxlibrary/source/myx_library.c.orig Sun Feb 22 03:37:26 2004
-+++ mysqlxlibrary/source/myx_library.c Sun Feb 22 03:34:03 2004
-@@ -102,7 +102,10 @@
-
- const char *myx_get_my_cnf_path()
- {
-- return myx_my_cnf_path;
-+ if (myx_my_cnf_path == NULL)
-+ return "";
-+ else
-+ return myx_my_cnf_path;
- }
-
-
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::myx_network.c /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::myx_network.c
--- /usr/ports/databases/mysql-administrator.orig/files/patch-mysqlxlibrary::source::myx_network.c Tue Feb 24 12:13:10 2004
+++ /usr/ports/databases/mysql-administrator/files/patch-mysqlxlibrary::source::myx_network.c Thu Jan 1 03:00:00 1970
@@ -1,13 +0,0 @@
---- mysqlxlibrary/source/myx_network.c.orig Sat Feb 21 17:44:47 2004
-+++ mysqlxlibrary/source/myx_network.c Sat Feb 21 17:45:54 2004
-@@ -36,6 +36,10 @@
- #include <arpa/inet.h>
- #include <netdb.h>
-
-+#if defined(__FreeBSD__)
-+#include <sys/socket.h>
-+#endif
-+
- #endif
-
- /*
diff -ruN --exclude=CVS /usr/ports/databases/mysql-administrator.orig/pkg-plist /usr/ports/databases/mysql-administrator/pkg-plist
--- /usr/ports/databases/mysql-administrator.orig/pkg-plist Tue Feb 24 04:34:39 2004
+++ /usr/ports/databases/mysql-administrator/pkg-plist Thu Apr 1 00:52:22 2004
@@ -118,6 +118,7 @@
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/common/connect_dialog.glade
share/mysql-gui/common/connect_to_instance.png
share/mysql-gui/common/dockpnl_bg_logo.png
--- mysql-administrator-1.0.2b.a.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list