Date: 2 Feb 2006 01:05:35 -0800 From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sem@FreeBSD.org Subject: ports/92727: [UPDATE] databases/mysql-administrator to 1.1.6 Message-ID: <BAY101-DAV16305354D93E487D50F2E4A70A0@phx.gbl> Resent-Message-ID: <200602020910.k129A3sW065017@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92727 >Category: ports >Synopsis: [UPDATE] databases/mysql-administrator to 1.1.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 02 09:10:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 6.0-RELEASE-p4 i386 >Organization: none >Environment: System: FreeBSD 6.0-RELEASE-p4 i386 MySQL 4.1, GTK 2.8.10 >Description: o Update port to version 1.1.6, we are at 1.0.22a now. o Current version is buggy and crashes a lot. 1.1.6 seems pretty stable. o According to website it fully supports MySQL 4.0, 4.1, and 5.0 - Might work with 4.0 and BROKEN_WITH_MYSQL 40 could be removed - Did not test on FreeBSD 4.x, so the BROKEN message still stands o Makefile changes: - Use MASTER_SITE_MYSQL instead - Needs a newer version of gtkmm - Remove USE_REINPLACE - DEFAULT_MYSQL_VER already defaults to 41 - Remove quotes from BROKEN message - Remove some unneeded patching - Use INSTALL_TARGET instead of install - portlint(1) >How-To-Repeat: - Apply supplied diff. - Remove the following file: mysql-administrator/files/patch-Makefile.am # uneeded - Remove the following directory: mysql-administrator/files # no more files >Fix: --- 2006-02-02-mysql-administrator.diff begins here --- diff -ruN mysql-administrator.orig/Makefile mysql-administrator/Makefile --- mysql-administrator.orig/Makefile Wed Feb 1 17:37:58 2006 +++ mysql-administrator/Makefile Thu Feb 2 03:31:32 2006 @@ -6,42 +6,31 @@ # PORTNAME= mysql-administrator -PORTVERSION= 1.0.22a -PORTREVISION= 1 +PORTVERSION= 1.1.6 CATEGORIES= databases -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%/ \ - http://mirrors.tilian.co.uk/%SUBDIR%/ \ - ftp://ftp.rtfm.no/pub/mysql/%SUBDIR%/ \ - ftp://ftp.u-paris10.fr/mysql.com/%SUBDIR%/ \ - http://mysql.oms-net.nl/%SUBDIR%/ -MASTER_SITE_SUBDIR= Downloads/MySQLAdministrationSuite +MASTER_SITES= ${MASTER_SITE_MYSQL} +MASTER_SITE_SUBDIR= MySQLAdministrationSuite MAINTAINER= sem@FreeBSD.org COMMENT= Powerful visual administration console for MySQL environment +LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ + pcre.0:${PORTSDIR}/devel/pcre +BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +RUN_DEPENDS= ${BUILD_DEPENDS} + USE_X_PREFIX= yes -USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOTOOLS= autoconf:259:env -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ +CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share/gnome USE_ICONV= yes USE_GNOME= libglade2 gnomehack USE_MYSQL= yes -DEFAULT_MYSQL_VER= 41 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} - GUI_CONFIG_COOKIE= ${WRKDIR}/.gui_configure_done GUI_BUILD_COOKIE= ${WRKDIR}/.gui_build_done MAIN_CONFIG_COOKIE= ${WRKDIR}/.main_configure_done @@ -53,18 +42,14 @@ .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -BROKEN= "can not build on 4.x" +BROKEN= can not build on 4.x .endif ONLY_FOR_ARCHS= i386 amd64 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 + ${WRKSRC}/mysql-administrator/omf.make do-configure: @${DO_NADA} @@ -90,9 +75,9 @@ fi do-install: - @cd ${GUI_DIR}; \ - ${GMAKE} install - @cd ${MAIN_DIR}; \ - ${GMAKE} install + @cd ${GUI_DIR}; \ + ${GMAKE} ${INSTALL_TARGET} + @cd ${MAIN_DIR}; \ + ${GMAKE} ${INSTALL_TARGET} .include <bsd.port.post.mk> diff -ruN mysql-administrator.orig/distinfo mysql-administrator/distinfo --- mysql-administrator.orig/distinfo Wed Feb 1 17:37:58 2006 +++ mysql-administrator/distinfo Wed Feb 1 18:06:59 2006 @@ -1,3 +1,3 @@ -MD5 (mysql-administrator-1.0.22a.tar.gz) = ed0f1af3eb7be03c2785ad9057492b75 -SHA256 (mysql-administrator-1.0.22a.tar.gz) = 0bdd965173d81e55ecf98cde8720e4e27f51ea42259331ea840251aa6572d819 -SIZE (mysql-administrator-1.0.22a.tar.gz) = 7444056 +MD5 (mysql-administrator-1.1.6.tar.gz) = 77c1c5a7b6f750b84873799bc9694ea5 +SHA256 (mysql-administrator-1.1.6.tar.gz) = 2c4b9ef41bc68cc10b5feea0a1f241739e144f0a66703adeaab54a73bc7424de +SIZE (mysql-administrator-1.1.6.tar.gz) = 12831693 diff -ruN mysql-administrator.orig/files/patch-Makefile.am mysql-administrator/files/patch-Makefile.am --- mysql-administrator.orig/files/patch-Makefile.am Wed Feb 1 17:37:58 2006 +++ mysql-administrator/files/patch-Makefile.am Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- 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 - diff -ruN mysql-administrator.orig/pkg-plist mysql-administrator/pkg-plist --- mysql-administrator.orig/pkg-plist Wed Feb 1 17:37:58 2006 +++ mysql-administrator/pkg-plist Wed Feb 1 21:06:33 2006 @@ -33,6 +33,7 @@ share/mysql-gui/administrator/16x16_User.png share/mysql-gui/administrator/16x16_UserAdmin.png share/mysql-gui/administrator/16x16_Users.png +share/mysql-gui/administrator/16x16_View.png share/mysql-gui/administrator/16x16_error.png share/mysql-gui/administrator/16x16_start.png share/mysql-gui/administrator/16x16_warning.png @@ -128,9 +129,21 @@ 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/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 @@ -139,18 +152,42 @@ 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 share/mysql-gui/common/field_overlay_edit.png share/mysql-gui/common/field_overlay_load.png +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/field_overlay_null.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/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 @@ -161,12 +198,42 @@ 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_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 @dirrm share/mysql-gui/common @dirrm share/mysql-gui/administrator @dirrm share/mysql-gui --- 2006-02-02-mysql-administrator.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BAY101-DAV16305354D93E487D50F2E4A70A0>