diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-12-03 09:33:13 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-12-03 09:33:13 +0000 |
| commit | 31cea5319a8594be336fae40bbeb085bd135b50f (patch) | |
| tree | 3bff84fa232f239573926d0db13cc52b562acd95 /databases/mysql55-server | |
| parent | a97438a8e813f57c06b16be1a23972327fc05354 (diff) | |
| download | freebsd-ports-31cea5319a8594be336fae40bbeb085bd135b50f.zip | |
Update to 5.5.41 release.
Diffstat (limited to 'databases/mysql55-server')
| -rw-r--r-- | databases/mysql55-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql55-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-client_CMakeLists.txt | 11 |
3 files changed, 11 insertions, 10 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 7c373816b91f..6f91b9ac7fd0 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.40 +PORTVERSION= 5.5.41 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -72,7 +72,7 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ +MMAN1= 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 \ @@ -83,6 +83,6 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" .endif post-patch: - @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt + @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include <bsd.port.mk> diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 526310297780..0613d577c10a 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 -SIZE (mysql-5.5.40.tar.gz) = 21727672 +SHA256 (mysql-5.5.41.tar.gz) = ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844 +SIZE (mysql-5.5.41.tar.gz) = 21768300 diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt index 2c5864188b98..fc496933828e 100644 --- a/databases/mysql55-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql55-server/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200 -+++ client/CMakeLists.txt 2011-10-07 11:06:21.000000000 +0200 -@@ -27,17 +27,20 @@ +--- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000 ++++ client/CMakeLists.txt 2014-12-03 09:23:56.610710083 +0000 +@@ -27,11 +27,13 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -14,6 +14,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) @@ -21,7 +22,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -46,17 +49,21 @@ +@@ -52,17 +55,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -43,7 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -66,13 +73,14 @@ +@@ -72,13 +79,14 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) |