5 files changed, 44 insertions, 25 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 8446e58348fd..81f283772717 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.4.3
+PORTVERSION=	5.5.0
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.4
+MASTER_SITE_SUBDIR=	MySQL-5.5
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-m2
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql54-client databases/mysql54-scripts
+SLAVEDIRS=	databases/mysql55-client databases/mysql55-scripts
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
@@ -94,11 +93,11 @@ CXXFLAGS+=	-fno-exceptions
 # MySQL-Server part
 .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	54
+WANT_MYSQL_VER=	55
 
-LATEST_LINK=	mysql54-server
+LATEST_LINK=	mysql55-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[01].* mysql-server-6.*
+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[0-46-9].* mysql-server-6.*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -148,7 +147,7 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common @sql_server_dirs@ libmysql storage scripts @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ sql-common scripts libservices @sql_server_dirs@ libmysql @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
@@ -169,9 +168,9 @@ post-install:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql54-client
+LATEST_LINK=	mysql55-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[01].* mysql-client-6.*
+CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[0-46-9].* mysql-client-6.*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -182,7 +181,7 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts @sql_client_dirs@ @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@@ -195,16 +194,16 @@ post-install:
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	54
+WANT_MYSQL_VER=	55
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql54
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql55
 .if ${PERL_LEVEL} <= 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-LATEST_LINK=	mysql54-scripts
+LATEST_LINK=	mysql55-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[01].* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[0-46-9].* mysql-scripts-6.*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 38ce1d9831cd..3d522026cab1 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.4.3-beta.tar.gz) = 9ea08558d51b1d56d3784028d57c2b08
-SHA256 (mysql-5.4.3-beta.tar.gz) = 525e84f4c1fa135a492ead6945e03d91d5e72dc31397ca2d713b3124bbc3fcb5
-SIZE (mysql-5.4.3-beta.tar.gz) = 21750728
+MD5 (mysql-5.5.0-m2.tar.gz) = 87e5f7455c425df04bab25a3f2de90c8
+SHA256 (mysql-5.5.0-m2.tar.gz) = b5e2d16b7c0720d9688f4335ebcfbb3e239e5bdbb65afa0892d899b2f0ce2dd5
+SIZE (mysql-5.5.0-m2.tar.gz) = 21399110
diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in
index 9f6f6ed9353e..d5296181d21a 100644
--- a/databases/mysql55-server/files/patch-Makefile.in
+++ b/databases/mysql55-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	2008-01-29 22:44:32.000000000 +0100
-+++ Makefile.in	2008-02-14 08:23:39.000000000 +0100
-@@ -398,14 +398,7 @@
+--- Makefile.in.orig	2009-12-07 20:09:53.000000000 +0100
++++ Makefile.in	2009-12-29 11:32:35.000000000 +0100
+@@ -408,14 +408,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ \
--			@sql_union_dirs@ unittest storage plugin \
+-			@pstack_dir@ libservices \
+-			@sql_union_dirs@ unittest \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			mysql-test support-files sql-bench \
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 8e9f5b22ee79..523a870ad7c5 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -68,6 +68,7 @@ lib/mysql/libheap.a
 lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
 lib/mysql/libmysqld.a
+lib/mysql/libmysqlservices.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a
@@ -79,6 +80,22 @@ lib/mysql/libvio.a
 %%PLUGINS%%lib/mysql/plugin/ha_example.la
 %%PLUGINS%%lib/mysql/plugin/ha_example.so
 %%PLUGINS%%lib/mysql/plugin/ha_example.so.0
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so.0
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.so
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.la
+%%PLUGINS%%lib/mysql/plugin/libdaemon_example.a
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so.0
+%%PLUGINS%%lib/mysql/plugin/mypluglib.so
+%%PLUGINS%%lib/mysql/plugin/mypluglib.la
+%%PLUGINS%%lib/mysql/plugin/mypluglib.a
+%%PLUGINS%%lib/mysql/plugin/libsemisync_master.so.0
+%%PLUGINS%%lib/mysql/plugin/libsemisync_master.so
+%%PLUGINS%%lib/mysql/plugin/libsemisync_master.la
+%%PLUGINS%%lib/mysql/plugin/libsemisync_master.a
+%%PLUGINS%%lib/mysql/plugin/libsemisync_slave.so.0
+%%PLUGINS%%lib/mysql/plugin/libsemisync_slave.so
+%%PLUGINS%%lib/mysql/plugin/libsemisync_slave.la
+%%PLUGINS%%lib/mysql/plugin/libsemisync_slave.a
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
@@ -118,7 +135,7 @@ libexec/mysqld
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dutch/errmsg.sys
 %%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg.txt
+%%DATADIR%%/errmsg-utf8.txt
 %%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/fill_help_tables.sql
 %%DATADIR%%/french/errmsg.sys
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 6314b3cb1464..3e635d9b3828 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -39,6 +39,9 @@ include/mysql/mysqld_error.h
 include/mysql/plugin.h
 include/mysql/probes_mysql.h
 include/mysql/probes_mysql_nodtrace.h
+include/mysql/services.h
+include/mysql/service_my_snprintf.h
+include/mysql/service_thd_alloc.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
 include/mysql/sslopt-case.h