aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2013-08-12 19:47:33 +0800
committerale <ale@FreeBSD.org>2013-08-12 19:47:33 +0800
commit87c7a6b1ce618384fe4af2e64467409ff049d30d (patch)
tree3d1c27dd26956c4754c8e3236318b961b384874a
parentc4020ff142f7caf64e7e15092cd9f5bd9718d3a1 (diff)
downloadfreebsd-ports-gnome-87c7a6b1ce618384fe4af2e64467409ff049d30d.tar.gz
freebsd-ports-gnome-87c7a6b1ce618384fe4af2e64467409ff049d30d.tar.zst
freebsd-ports-gnome-87c7a6b1ce618384fe4af2e64467409ff049d30d.zip
Update to 5.6.13 release.
-rw-r--r--databases/mysql56-server/Makefile2
-rw-r--r--databases/mysql56-server/distinfo4
-rw-r--r--databases/mysql56-server/files/patch-libmysql_CMakeLists.txt22
3 files changed, 14 insertions, 14 deletions
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index a1d631739a64..855af42fe60f 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.12
+PORTVERSION= 5.6.13
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo
index bac202c1e654..d97d2a9862b2 100644
--- a/databases/mysql56-server/distinfo
+++ b/databases/mysql56-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.12.tar.gz) = 7911af0180c8014b9193bde42b6b705460fa70bf75681b62c64d1cf2580686bc
-SIZE (mysql-5.6.12.tar.gz) = 35853760
+SHA256 (mysql-5.6.13.tar.gz) = 5d1b230c3ce896fbea47a69b14b9efb122621a19f32c1102d388d8e7fa442d7e
+SIZE (mysql-5.6.13.tar.gz) = 35951160
diff --git a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
index c8e83a11342c..1f9b8282e5d3 100644
--- a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200
-+++ libmysql/CMakeLists.txt 2013-04-19 15:04:52.000000000 +0200
-@@ -173,13 +173,14 @@
+--- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200
++++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200
+@@ -173,7 +173,7 @@
ENDIF()
# Merge several convenience libraries into one big mysqlclient
@@ -9,16 +9,16 @@
# Visual Studio users need debug static library for debug projects
IF(MSVC)
- INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+@@ -200,19 +200,22 @@
+ ENDMACRO()
ENDIF()
+IF(FALSE)
IF(UNIX)
- MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
- SET(DOT_VERSION ".${VERSION}")
-@@ -194,13 +195,15 @@
- ENDMACRO()
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+ GET_TARGET_NAME(mysqlclient lib_name)
+ INSTALL_SYMLINK(mysqlclient
+ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
+ ${INSTALL_LIBDIR} Development)
ENDIF()
+ENDIF()
@@ -33,8 +33,8 @@
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -251,4 +254,5 @@
- INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
+@@ -271,4 +274,5 @@
+ ${INSTALL_LIBDIR} SharedLibraries)
ENDFOREACH()
ENDIF()
+ ENDIF()