- Update to 1.0.20

6 files changed, 37 insertions, 54 deletions

diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index 253edcc..993b964 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mysql-administrator
-PORTVERSION=	1.0.14
-PORTREVISION=	2
+PORTVERSION=	1.0.20
 CATEGORIES=	databases
 MASTER_SITES=	http://www.softagency.co.jp/MySQL/%SUBDIR%/ \
 		ftp://sunsite.dk/mirrors/mysql/%SUBDIR%/ \
@@ -32,6 +31,7 @@ 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
 
@@ -41,10 +41,21 @@ LIB_DEPENDS+=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
 BUILD_DEPENDS=  scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-DIRS_ORDER=	mysql-gui-common mysql-administrator
+GUI_CONFIG_COOKIE=	${WRKDIR}/.gui_configure_done
+GUI_BUILD_COOKIE=	${WRKDIR}/.gui_build_done
+MAIN_CONFIG_COOKIE=	${WRKDIR}/.main_configure_done
+MAIN_BUILD_COOKIE=	${WRKDIR}/.main_build_done
+
+GUI_DIR=	${WRKSRC}/mysql-gui-common
+MAIN_DIR=	${WRKSRC}/mysql-administrator
 
 .include <bsd.port.pre.mk>
 
+# XXX
+.if ${OSVERSION} < 500000
+BROKEN=		Does not build on 4.x
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s#%%PTHREAD_CFLAGS%%#${PTHREAD_CFLAGS}#" \
 			${WRKSRC}/mysql-administrator/source/linux/Makefile.am
@@ -57,24 +68,29 @@ do-configure:
 	@${DO_NADA}
 
 do-build:
-	@for d in ${DIRS_ORDER}; do \
-		${ECHO_MSG} ""; \
-		${ECHO_MSG} "--->"; \
-		${ECHO_MSG} "---> Building: $${d}"; \
-		${ECHO_MSG} "--->"; \
-		cd ${WRKSRC}/$${d}; \
+	@cd ${GUI_DIR}; \
+	if [ ! -f ${GUI_CONFIG_COOKIE} ]; then \
+		${TOUCH} ${TOUCH_FLAGS} ${GUI_CONFIG_COOKIE}; \
+		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+	fi; \
+	if [ ! -f ${GUI_BUILD_COOKIE} ]; then \
+		${TOUCH} ${TOUCH_FLAGS} ${GUI_BUILD_COOKIE}; \
+		${GMAKE} DATADIRNAME=share; \
+	fi
+	@cd ${MAIN_DIR}; \
+	if [ ! -f ${MAIN_CONFIG_COOKIE} ]; then \
+		${TOUCH} ${TOUCH_FLAGS} ${MAIN_CONFIG_COOKIE}; \
 		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+	fi; \
+	if [ ! -f ${MAIN_BUILD_COOKIE} ]; then \
+		${TOUCH} ${TOUCH_FLAGS} ${MAIN_BUILD_COOKIE}; \
 		${GMAKE} DATADIRNAME=share; \
-	done
+	fi
 
 do-install:
-	@for d in ${DIRS_ORDER}; do \
-		${ECHO_MSG} ""; \
-		${ECHO_MSG} "--->"; \
-		${ECHO_MSG} "---> Installing: $${d}"; \
-		${ECHO_MSG} "--->"; \
-		cd ${WRKSRC}/$${d}; \
-		${GMAKE} install; \
-	done
+		@cd ${GUI_DIR}; \
+		${GMAKE} install
+		@cd ${MAIN_DIR}; \
+		${GMAKE} install
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql-administrator/distinfo b/databases/mysql-administrator/distinfo
index 48a9c36..d15da8c 100644
--- a/databases/mysql-administrator/distinfo
+++ b/databases/mysql-administrator/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-administrator-1.0.14.tar.gz) = 80cf9922eec79175680f495db05e49d9
-SIZE (mysql-administrator-1.0.14.tar.gz) = 4292913
+MD5 (mysql-administrator-1.0.20.tar.gz) = c34432c4c6dcf74ae0f3eab6f58dcef2
+SIZE (mysql-administrator-1.0.20.tar.gz) = 7019341
diff --git a/databases/mysql-administrator/files/patch-myx_aux_functions.h b/databases/mysql-administrator/files/patch-myx_aux_functions.h
deleted file mode 100644
index 9ab752c..0000000
--- a/databases/mysql-administrator/files/patch-myx_aux_functions.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
- 
diff --git a/databases/mysql-administrator/files/patch-myx_grt_private.c b/databases/mysql-administrator/files/patch-myx_grt_private.c
deleted file mode 100644
index cbe7fae..0000000
--- a/databases/mysql-administrator/files/patch-myx_grt_private.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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);
diff --git a/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c b/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c
deleted file mode 100644
index d8df6b8..0000000
--- a/databases/mysql-administrator/files/patch-myx_ser_aux_functions.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/databases/mysql-administrator/pkg-plist b/databases/mysql-administrator/pkg-plist
index 79ec366..7b0144c 100644
--- a/databases/mysql-administrator/pkg-plist
+++ b/databases/mysql-administrator/pkg-plist
@@ -68,6 +68,7 @@ share/mysql-gui/administrator/backup_gray.png
 share/mysql-gui/administrator/catalogs.glade
 share/mysql-gui/administrator/catalogs.png
 share/mysql-gui/administrator/catalogs_gray.png
+share/mysql-gui/administrator/connect_header_admin.png
 share/mysql-gui/administrator/disk_level_bg.png
 share/mysql-gui/administrator/disk_level_fg.png
 share/mysql-gui/administrator/health.glade