5 files changed, 21 insertions, 20 deletions

diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 9f004d494e4d..fd5ad26d711c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.35
+PORTVERSION=	5.4.1
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.1
+MASTER_SITE_SUBDIR=	MySQL-5.4
 PKGNAMESUFFIX?=	-server
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
+SLAVEDIRS=	databases/mysql54-client databases/mysql54-scripts
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -87,11 +88,11 @@ CXXFLAGS+=	-fno-exceptions
 # MySQL-Server part
 .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	51
+WANT_MYSQL_VER=	54
 
-LATEST_LINK=	mysql51-server
+LATEST_LINK=	mysql54-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.[01].* mysql-server-6.*
 
 USE_RC_SUBR=	mysql-server.sh
 
@@ -161,16 +162,14 @@ post-install:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
-LATEST_LINK=	mysql51-client
+LATEST_LINK=	mysql54-client
 
-CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
+CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.[01].* mysql-client-6.*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
 		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1
 
-MAN8=		mysqlmanager.8
-
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CONFIGURE_ARGS+=--without-server
@@ -180,7 +179,7 @@ post-patch:
 	@${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
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 
 post-install:
@@ -189,16 +188,16 @@ post-install:
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	51
+WANT_MYSQL_VER=	54
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql51
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql54
 .if ${PERL_LEVEL} <= 500800
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-LATEST_LINK=	mysql51-scripts
+LATEST_LINK=	mysql54-scripts
 
-CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
+CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.[01].* 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/percona55-server/distinfo b/databases/percona55-server/distinfo
index 0532d5dfe527..74f0168a2aba 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.35.tar.gz) = 327bffc7a2a5fd4471fbbaab125275cd
-SHA256 (mysql-5.1.35.tar.gz) = ea1ee8963d2e94167f32d73099936a4fdacc1a501d0155a73e4f54e705340b5a
-SIZE (mysql-5.1.35.tar.gz) = 35152597
+MD5 (mysql-5.4.1-beta.tar.gz) = 65e7a154e065c92c2a6bb97c9043b8b6
+SHA256 (mysql-5.4.1-beta.tar.gz) = 43b0ff572e9f1a39d84c3a74d24f63382003e8ca54d73231064d9ba075d1dcb7
+SIZE (mysql-5.4.1-beta.tar.gz) = 35199612
diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in
index bea65ccf9521..9f6f6ed9353e 100644
--- a/databases/percona55-server/files/patch-Makefile.in
+++ b/databases/percona55-server/files/patch-Makefile.in
@@ -10,7 +10,7 @@
 -			@sql_union_dirs@ unittest storage plugin \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
--			mysql-test support-files sql-bench @tools_dirs@ \
+-			mysql-test support-files sql-bench \
 -			win
 +SUBDIRS =
  
diff --git a/databases/percona55-server/files/patch-mysys_default.c b/databases/percona55-server/files/patch-mysys_default.c
index 507d31425c68..accb061193f4 100644
--- a/databases/percona55-server/files/patch-mysys_default.c
+++ b/databases/percona55-server/files/patch-mysys_default.c
@@ -12,7 +12,7 @@
 @@ -1128,7 +1128,10 @@
  
  #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
+   if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
 +    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index 19c3949a63c4..6314b3cb1464 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -37,6 +37,8 @@ include/mysql/mysql_version.h
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
 include/mysql/plugin.h
+include/mysql/probes_mysql.h
+include/mysql/probes_mysql_nodtrace.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
 include/mysql/sslopt-case.h