[Midnightbsd-cvs] mports [21517] trunk/databases: mysql 5.5.46

[laffer1 at midnightbsd.org]

Revision: 21517
          http://svnweb.midnightbsd.org/mports/?rev=21517
Author:   laffer1
Date:     2016-08-05 20:06:02 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
mysql 5.5.46

Modified Paths:
--------------
    trunk/databases/mysql55-client/files/patch-CMakeLists.txt
    trunk/databases/mysql55-server/Makefile

Modified: trunk/databases/mysql55-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2016-08-06 00:01:36 UTC (rev 21516)
+++ trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2016-08-06 00:06:02 UTC (rev 21517)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-11-04 07:49:52.000000000 +0000
-+++ CMakeLists.txt	2014-12-03 09:20:45.966491617 +0000
-@@ -387,32 +387,11 @@
+--- CMakeLists.txt.orig	2015-06-25 13:44:36.000000000 +0000
++++ CMakeLists.txt	2015-09-19 07:48:14.145882685 +0000
+@@ -390,33 +390,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -29,6 +29,7 @@
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
 -  ADD_SUBDIRECTORY(packaging/rpm-sles)
+-  ADD_SUBDIRECTORY(packaging/rpm-docker)
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -38,7 +39,7 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -448,19 +427,21 @@
+@@ -453,19 +431,21 @@
  ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
@@ -61,7 +62,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -486,6 +467,7 @@
+@@ -491,6 +471,7 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Modified: trunk/databases/mysql55-server/Makefile
===================================================================
--- trunk/databases/mysql55-server/Makefile	2016-08-06 00:01:36 UTC (rev 21516)
+++ trunk/databases/mysql55-server/Makefile	2016-08-06 00:06:02 UTC (rev 21517)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.44
+PORTVERSION=	5.5.46
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.5
@@ -49,12 +49,10 @@
 
 .include <bsd.mport.options.mk>
 
-#.if ${OSVERSION} < 4015
 CMAKE_ARGS+=	-DCMAKE_THREAD_LIBS="" \
 		-DCMAKE_USE_PTHREADS=1 \
 		-DCMAKE_EXE_LINKER_FLAGS="${PTHREAD_LIBS}" \
 		-DENABLE_DTRACE:BOOL=OFF
-#.endif
 
 .if ${PORT_OPTIONS:MSSL}
 CMAKE_ARGS+=	-DWITH_SSL=bundled