Index: head/databases/percona55-client/Makefile =================================================================== --- head/databases/percona55-client/Makefile (revision 392878) +++ head/databases/percona55-client/Makefile (revision 392879) @@ -1,38 +1,37 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION= 1 PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../percona55-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql*-client-* \ mariadb*-client-* \ percona5[0-46-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 CMAKE_ARGS+= -DENABLE_DTRACE=OFF USE_LDCONFIG= ${PREFIX}/lib/mysql 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 # Percona renamed the libraries, until we decide how to deal with it create some symlinks # to prevent breaking installed ports. post-install: ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so ${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 ${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so ${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18 .include "${MASTERDIR}/Makefile" Index: head/databases/percona55-client/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/percona55-client/files/patch-extra_CMakeLists.txt (revision 392878) +++ head/databases/percona55-client/files/patch-extra_CMakeLists.txt (revision 392879) @@ -1,25 +1,26 @@ ---- extra/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 -+++ extra/CMakeLists.txt 2010-12-23 14:45:36.000000000 +0100 -@@ -50,6 +50,7 @@ +--- extra/CMakeLists.txt.orig 2015-07-25 11:30:53 UTC ++++ extra/CMakeLists.txt +@@ -50,6 +50,7 @@ ADD_CUSTOM_TARGET(GenError ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) +IF(FALSE) MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -69,11 +70,14 @@ +@@ -69,12 +70,15 @@ ENDIF() MYSQL_ADD_EXECUTABLE(replace replace.c) TARGET_LINK_LIBRARIES(replace mysys) +ENDIF() IF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) + TARGET_LINK_LIBRARIES(innochecksum ${ZLIB_LIBRARY}) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) Index: head/databases/percona55-server/Makefile =================================================================== --- head/databases/percona55-server/Makefile (revision 392878) +++ head/databases/percona55-server/Makefile (revision 392879) @@ -1,99 +1,99 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.43-37.2 +DISTVERSION= 5.5.44-37.3 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 55-server DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona55-client USES= bison cmake readline shebangfix CXXFLAGS+= ${CPPFLAGS} OPTIONS_DEFINE= OPENSSL FASTMTX OPTIONS_DEFAULT= OPENSSL FASTMTX_DESC= Replace mutexes with spinlocks DATADIR= ${PREFIX}/share/mysql CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 \ -DWITH_UNIT_TESTS=0 \ -DENABLE_DTRACE=OFF SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .include .if ${PORT_OPTIONS:MOPENSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 55p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ percona5[0-46-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql 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 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include Index: head/databases/percona55-server/distinfo =================================================================== --- head/databases/percona55-server/distinfo (revision 392878) +++ head/databases/percona55-server/distinfo (revision 392879) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.5.43-37.2.tar.gz) = f3ee6cce2062ddc45ea8da7e93a49e069c80e4ce2c520282486ded14a4088ef0 -SIZE (percona-server-5.5.43-37.2.tar.gz) = 22707580 +SHA256 (percona-server-5.5.44-37.3.tar.gz) = 0fa6d5203eda766778cb26cbc70fbc3d50a3472322d30a2afffb5c3ab12eaed2 +SIZE (percona-server-5.5.44-37.3.tar.gz) = 22724202