- update to 5.6.14.r62.0

- support stage

5 files changed, 51 insertions, 15 deletions

diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile
index 5ae3fc7bc013..e5a9f0134e36 100644
--- a/databases/percona56-client/Makefile
+++ b/databases/percona56-client/Makefile
@@ -18,11 +18,10 @@ CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
-MAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
+MANPAGES=	comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
 
 CLIENT_ONLY=	yes
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist
index 9658109c8319..53fa68dfefe7 100644
--- a/databases/percona56-client/pkg-plist
+++ b/databases/percona56-client/pkg-plist
@@ -92,6 +92,20 @@ lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.18
 lib/mysql/libmysqlservices.a
+man/man1/comp_err.1.gz
+man/man1/msql2mysql.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
 share/aclocal/mysql.m4
 @dirrm include/mysql/mysql/psi
 @dirrm include/mysql/mysql
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index 4682b1ca1de0..675fc947895b 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.6.13-rel61.0
+DISTVERSION=	5.6.14-rel62.0
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
-MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
+MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/LATEST/release-${DISTVERSION:S/rel//}/483/source/
 PKGNAMESUFFIX?=	56-server
-DISTNAME=	Percona-Server-5.6.13-rel61.0
+DISTNAME=	Percona-Server-5.6.14-rel62.0
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -46,7 +46,6 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -70,25 +69,22 @@ GROUPS=		mysql
 
 INFO=		mysql
 
-MAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
+MANPAGES=	my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
-MAN8=		mysqld.8
-
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${MKDIR} ${STAGEDIR}/var/db/mysql
+
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
+	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo
index 768d4294636c..731328e8adda 100644
--- a/databases/percona56-server/distinfo
+++ b/databases/percona56-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Percona-Server-5.6.13-rel61.0.tar.gz) = 6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8
-SIZE (Percona-Server-5.6.13-rel61.0.tar.gz) = 33401056
+SHA256 (Percona-Server-5.6.14-rel62.0.tar.gz) = 69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280
+SIZE (Percona-Server-5.6.14-rel62.0.tar.gz) = 33386914
diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist
index 9c5de10c5ef8..408ad67e95f5 100644
--- a/databases/percona56-server/pkg-plist
+++ b/databases/percona56-server/pkg-plist
@@ -38,6 +38,33 @@ lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/validate_password.so
 libexec/mysqld
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_convert_table_format.1.gz
+man/man1/mysql_fix_extensions.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_secure_installation.1.gz
+man/man1/mysql_setpermission.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_upgrade.1.gz
+man/man1/mysql_zap.1.gz
+man/man1/mysqlbug.1.gz
+man/man1/mysqld_multi.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqldumpslow.1.gz
+man/man1/mysqlhotcopy.1.gz
+man/man1/mysqlman.1.gz
+man/man1/mysqltest.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
+man/man8/mysqld.8.gz
 %%DATADIR%%/binary-configure
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml