Date: Mon, 22 Apr 2013 18:45:59 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316260 - in head/databases/mysql56-server: . files Message-ID: <201304221845.r3MIjxp7058098@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Mon Apr 22 18:45:59 2013 New Revision: 316260 URL: http://svnweb.freebsd.org/changeset/ports/316260 Log: Update to 5.6.11 release. Deleted: head/databases/mysql56-server/files/patch-sql_mysqld.cc Modified: head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt head/databases/mysql56-server/files/patch-sql_CMakeLists.txt Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Mon Apr 22 18:44:24 2013 (r316259) +++ head/databases/mysql56-server/Makefile Mon Apr 22 18:45:59 2013 (r316260) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.10 +PORTVERSION= 5.6.11 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Mon Apr 22 18:44:24 2013 (r316259) +++ head/databases/mysql56-server/distinfo Mon Apr 22 18:45:59 2013 (r316260) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 -SIZE (mysql-5.6.10.tar.gz) = 35174149 +SHA256 (mysql-5.6.11.tar.gz) = ea4a494ea926a20ada56b1c139afdc65f5a68827068a509cd0801640d8dd079e +SIZE (mysql-5.6.11.tar.gz) = 35458544 Modified: head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Mon Apr 22 18:44:24 2013 (r316259) +++ head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt Mon Apr 22 18:45:59 2013 (r316260) @@ -1,9 +1,9 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- 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 @@ + ENDIF() # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) @@ -16,21 +16,26 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -194,13 +195,15 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -251,4 +254,5 @@ + INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() ++ ENDIF() ENDIF() -+ENDIF() Modified: head/databases/mysql56-server/files/patch-sql_CMakeLists.txt ============================================================================== --- head/databases/mysql56-server/files/patch-sql_CMakeLists.txt Mon Apr 22 18:44:24 2013 (r316259) +++ head/databases/mysql56-server/files/patch-sql_CMakeLists.txt Mon Apr 22 18:45:59 2013 (r316260) @@ -1,14 +1,14 @@ ---- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100 -+++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100 -@@ -245,6 +245,7 @@ +--- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 ++++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200 +@@ -423,6 +423,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") +IF(FALSE) - # We need to create empty directories (data/test) the installation. - # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 - # Avoid completely empty directories and install dummy file instead. -@@ -286,6 +287,7 @@ + # Copy db.opt into data/test/ + SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) + INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) +@@ -467,6 +468,7 @@ INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF() ENDIF()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304221845.r3MIjxp7058098>