diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2012-10-12 13:44:59 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2012-10-12 13:44:59 +0000 |
| commit | 5e84c1164a0c58308809c8d9d12401180e16e449 (patch) | |
| tree | a4373be8391dcb364908675bfd06d5ca21263722 /databases | |
| parent | Update to 5.1.66 release. (diff) | |
Update to 5.5.28 release and switch to OptionsNG.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=305778
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql55-client/files/patch-CMakeLists.txt | 13 | ||||
| -rw-r--r-- | databases/mysql55-server/Makefile | 19 | ||||
| -rw-r--r-- | databases/mysql55-server/distinfo | 4 |
3 files changed, 19 insertions, 17 deletions
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt index 934244b14ec5..fb72365c367f 100644 --- a/databases/mysql55-client/files/patch-CMakeLists.txt +++ b/databases/mysql55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 -+++ CMakeLists.txt 2010-12-23 17:01:52.000000000 +0100 -@@ -292,27 +292,11 @@ +--- CMakeLists.txt.orig 2012-08-29 10:50:46.000000000 +0200 ++++ CMakeLists.txt 2012-10-12 15:29:18.000000000 +0200 +@@ -304,30 +304,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -24,6 +24,9 @@ - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) +- ADD_SUBDIRECTORY(internal) +- ENDIF() -ENDIF() +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) @@ -33,7 +36,7 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -338,11 +322,11 @@ +@@ -371,11 +352,11 @@ INCLUDE(CPack) IF(UNIX) @@ -46,7 +49,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -367,3 +351,4 @@ +@@ -401,3 +382,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 43537c88f639..ed624de48004 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: MySQL-server -# Date created: 28 Jan 2006 -# Whom: Alex Dupre <ale@FreeBSD.org> -# +# Created by: Alex Dupre <ale@FreeBSD.org> # $FreeBSD$ -# PORTNAME?= mysql -PORTVERSION= 5.5.27 +PORTVERSION= 5.5.28 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -19,9 +15,12 @@ COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql55-client USE_CMAKE= yes MAKE_JOBS_SAFE= yes +NO_OPTIONS_SORT=yes -OPTIONS= OPENSSL "Enable SSL support" on \ - FASTMTX "Replace mutexes with spinlocks" off +OPTIONS_DEFINE= SSL FASTMTX +OPTIONS_DEFAULT=SSL + +FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -47,10 +46,10 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ .include <bsd.port.options.mk> -.if !defined(WITHOUT_OPENSSL) +.if ${PORT_OPTIONS:MSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif -.if defined(WITH_FASTMTX) +.if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 70119f438780..5c60f47725da 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.27.tar.gz) = 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4 -SIZE (mysql-5.5.27.tar.gz) = 24667156 +SHA256 (mysql-5.5.28.tar.gz) = f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f +SIZE (mysql-5.5.28.tar.gz) = 24739429 |