diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index ba96157ec754..c7a67f072362 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -1,34 +1,37 @@ # $FreeBSD$ PORTNAME= percona PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../percona55-server PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-46-9]-client-* percona[0-46-9][0-9]-client-* +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" diff --git a/databases/percona55-client/files/patch-CMakeLists.txt b/databases/percona55-client/files/patch-CMakeLists.txt index d677a2c75ac8..3636f8cf76b1 100644 --- a/databases/percona55-client/files/patch-CMakeLists.txt +++ b/databases/percona55-client/files/patch-CMakeLists.txt @@ -1,69 +1,70 @@ ---- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 -+++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200 -@@ -305,32 +305,11 @@ +--- CMakeLists.txt.orig 2014-10-06 18:02:58.000000000 +0200 ++++ CMakeLists.txt 2014-10-17 20:59:57.890024727 +0200 +@@ -419,31 +419,12 @@ ENDIF() ADD_SUBDIRECTORY(extra) -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-uln) - ADD_SUBDIRECTORY(packaging/rpm-oel) -ENDIF() ++ +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) +ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(man) INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -365,8 +345,10 @@ +@@ -479,19 +460,21 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() +IF(FALSE) ADD_SUBDIRECTORY(packaging/WiX) ADD_SUBDIRECTORY(packaging/solaris) +ENDIF() # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) -@@ -374,11 +356,11 @@ + SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - INCLUDE(CPack) IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -404,3 +386,4 @@ +@@ -518,5 +501,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() + + INCLUDE(CPack) diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 8468518d8f8a..45a721d6a3cb 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,96 +1,99 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.38-35.2 +DISTVERSION= 5.5.40-36.1 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 + -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[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-46-9]-server-* percona[0-46-9][0-9]-server-* +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 diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 843a76e55cdd..61a281eaae3a 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.5.38-35.2.tar.gz) = 2726d8443a4e87e1a1f11c56dfcd1aa79a5a2ff8cbff9f229c8589cdedbf031d -SIZE (percona-server-5.5.38-35.2.tar.gz) = 22946764 +SHA256 (percona-server-5.5.40-36.1.tar.gz) = 33b2a66c2a221ec4e02b38f065f5a8fbbe5fdcaaf00e0ae5f267d4e2b746ffb4 +SIZE (percona-server-5.5.40-36.1.tar.gz) = 22710586