svn commit: r373399 - in head/databases: percona56-client percona56-client/files percona56-server percona56-server/files

Florian Smeets flo at FreeBSD.org
Tue Nov 25 11:28:59 UTC 2014 

Author: flo
Date: Tue Nov 25 11:28:56 2014
New Revision: 373399
URL: https://svnweb.freebsd.org/changeset/ports/373399
QAT: https://qat.redports.org/buildarchive/r373399/

Log:
  Update to 5.6.21-70.1
  Update CONFLICTS [1]
  
  PR:		194821 [1]
  Submitted by:	Bernard Spil <spil.oss at gmail.com> [1]

Deleted:
  head/databases/percona56-server/files/patch-plugin_innodb_memcached_innodb_memcache_src_innodb_engine.c
Modified:
  head/databases/percona56-client/Makefile
  head/databases/percona56-client/files/patch-CMakeLists.txt
  head/databases/percona56-server/Makefile
  head/databases/percona56-server/distinfo
  head/databases/percona56-server/files/patch-CMakeLists.txt
  head/databases/percona56-server/pkg-plist

Modified: head/databases/percona56-client/Makefile
==============================================================================
--- head/databases/percona56-client/Makefile	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-client/Makefile	Tue Nov 25 11:28:56 2014	(r373399)
@@ -12,7 +12,9 @@ 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-57-9]-client-* percona[0-46-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql*-client-* \
+			mariadb*-client-* \
+			percona5[0-57-9]-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

Modified: head/databases/percona56-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/percona56-client/files/patch-CMakeLists.txt	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-client/files/patch-CMakeLists.txt	Tue Nov 25 11:28:56 2014	(r373399)
@@ -1,45 +1,47 @@
---- CMakeLists.txt.orig	2013-11-17 18:02:53.000000000 +0000
-+++ CMakeLists.txt	2013-12-16 14:43:48.037159232 +0000
-@@ -458,33 +458,11 @@
- ENDIF()
+--- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
++++ CMakeLists.txt	2014-10-18 16:20:43.311977761 +0200
+@@ -500,39 +500,17 @@
  
  ADD_SUBDIRECTORY(extra)
+ ADD_SUBDIRECTORY(client)
+-ADD_SUBDIRECTORY(sql/share)
+ ADD_SUBDIRECTORY(libservices)
++ADD_SUBDIRECTORY(support-files)
+ 
+ IF(UNIX)
+   ADD_SUBDIRECTORY(man)
+ ENDIF()
+ 
 -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)
+-ENDIF()
 -
+ # scripts/mysql_config depends on client and server targets loaded above.
+ # It is referenced by some of the directories below, so we insert it here.
+ ADD_SUBDIRECTORY(scripts)
+ 
+-IF(NOT WITHOUT_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)
 -  ADD_SUBDIRECTORY(packaging/rpm-fedora)
 -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)
-@@ -521,18 +499,17 @@
+ 
+@@ -568,18 +546,17 @@
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -59,7 +61,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -558,5 +535,6 @@
+@@ -605,5 +582,6 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/percona56-server/Makefile	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-server/Makefile	Tue Nov 25 11:28:56 2014	(r373399)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.6.19-67.0
+DISTVERSION=	5.6.21-70.1
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
@@ -63,7 +63,9 @@ CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	56p
 
-CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql*-server-* \
+			mariadb*-server-* \
+			percona5[0-57-9]-server-*
 
 USE_RC_SUBR=	mysql-server
 

Modified: head/databases/percona56-server/distinfo
==============================================================================
--- head/databases/percona56-server/distinfo	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-server/distinfo	Tue Nov 25 11:28:56 2014	(r373399)
@@ -1,2 +1,2 @@
-SHA256 (percona-server-5.6.19-67.0.tar.gz) = 5099e9d0ec69124f44596005a2dad92697dc2b6f8ab54d32bdb089945b76c346
-SIZE (percona-server-5.6.19-67.0.tar.gz) = 34127811
+SHA256 (percona-server-5.6.21-70.1.tar.gz) = 3f2ed35912a7a22f740be441078736e868a079b2f76e82988720e238b3ea8160
+SIZE (percona-server-5.6.21-70.1.tar.gz) = 33911244

Modified: head/databases/percona56-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/percona56-server/files/patch-CMakeLists.txt	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-server/files/patch-CMakeLists.txt	Tue Nov 25 11:28:56 2014	(r373399)
@@ -1,29 +1,30 @@
---- CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ CMakeLists.txt	2013-02-13 14:40:46.000000000 +0100
-@@ -379,7 +379,6 @@
+--- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
++++ CMakeLists.txt	2014-10-18 18:37:40.964417855 +0200
+@@ -508,12 +508,10 @@
+ ENDIF()
  
- ADD_SUBDIRECTORY(extra)
  IF(NOT WITHOUT_SERVER)
 -  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(client)
    ADD_SUBDIRECTORY(sql)
-   ADD_SUBDIRECTORY(sql/share)
-@@ -387,14 +386,10 @@
    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)
+ ENDIF()
+ 
+@@ -522,10 +520,7 @@
+ ADD_SUBDIRECTORY(scripts)
  
+ IF(NOT WITHOUT_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)
+   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+     ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -439,7 +434,6 @@
+@@ -568,7 +563,6 @@
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -31,7 +32,7 @@
  
  # Create a single package with "make package"
  # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -452,6 +446,7 @@
+@@ -580,6 +574,7 @@
  #
  # RPM installs documentation directly from the source tree
  #
@@ -39,8 +40,10 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -477,3 +472,4 @@
+@@ -605,5 +600,6 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
 +ENDIF()
+ 
+ INCLUDE(CPack)

Modified: head/databases/percona56-server/pkg-plist
==============================================================================
--- head/databases/percona56-server/pkg-plist	Tue Nov 25 11:27:57 2014	(r373398)
+++ head/databases/percona56-server/pkg-plist	Tue Nov 25 11:28:56 2014	(r373399)
@@ -40,6 +40,7 @@ lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/query_response_time.so
 lib/mysql/plugin/scalability_metrics.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
@@ -135,5 +136,15 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/slovak/errmsg.sys
 %%DATADIR%%/spanish/errmsg.sys
 %%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/tests/suite/query_response_time/basic.result
+%%DATADIR%%/tests/suite/query_response_time/basic.test
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result
+%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test
+%%DATADIR%%/tests/suite/query_response_time/query_response_time.inc
+%%DATADIR%%/tests/suite/query_response_time/query_response_time.result
+%%DATADIR%%/tests/suite/query_response_time/query_response_time.test
+%%DATADIR%%/tests/suite/query_response_time/suite.opt
+%%DATADIR%%/tests/suite/query_response_time/suite.pm
 %%DATADIR%%/ukrainian/errmsg.sys
- at dir /var/db/mysql
+ at dir(mysql,mysql,) /var/db/mysql

More information about the svn-ports-all mailing list