sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.5.41 release.

Browse source
This commit is contained in:
Alex Dupre 2014-12-03 09:33:13 +00:00
parent a97438a8e8
commit 31cea5319a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=373804
6 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
databases/mysql55-client/Makefile
View file

@ -20,7 +20,7 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1
USE_LDCONFIG= ${PREFIX}/lib/mysql USE_LDCONFIG= ${PREFIX}/lib/mysql
MAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1

17
databases/mysql55-client/files/patch-CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 --- CMakeLists.txt.orig 2014-11-04 07:49:52.000000000 +0000
+++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200 +++ CMakeLists.txt 2014-12-03 09:20:45.966491617 +0000
@@ -305,31 +305,11 @@ @@ -387,32 +387,11 @@
ENDIF() ENDIF()
ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(extra)
@ -28,6 +28,7 @@
- ADD_SUBDIRECTORY(internal) - ADD_SUBDIRECTORY(internal)
- ENDIF() - ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-sles)
-ENDIF() -ENDIF()
+ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(libservices)
@ -37,7 +38,7 @@
INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake) INCLUDE(cmake/tags.cmake)
@@ -365,8 +345,10 @@ @@ -448,19 +427,21 @@
ELSE() ELSE()
SET(CPACK_GENERATOR "TGZ") SET(CPACK_GENERATOR "TGZ")
ENDIF() ENDIF()
@ -48,9 +49,8 @@
# Create a single package with "make package" # Create a single package with "make package"
# (see http://public.kitware.com/Bug/view.php?id=11452) # (see http://public.kitware.com/Bug/view.php?id=11452)
@@ -374,11 +356,11 @@ SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
INCLUDE(CPack)
IF(UNIX) IF(UNIX)
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
ENDIF() ENDIF()
@ -61,8 +61,11 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM") IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR} DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -404,3 +386,4 @@ @@ -486,6 +467,7 @@
PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE
) )
ENDIF() ENDIF()
+ENDIF() +ENDIF()
INCLUDE(CPack)

14
databases/mysql55-client/files/patch-client_CMakeLists.txt
View file

@ -1,18 +1,22 @@
--- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200 --- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000
+++ client/CMakeLists.txt 2011-10-07 11:08:18.000000000 +0200 +++ client/CMakeLists.txt 2014-12-03 09:22:09.860599069 +0000
@@ -33,9 +33,11 @@ @@ -33,6 +33,7 @@
TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
ENDIF(UNIX) ENDIF(UNIX)
+IF(FALSE) +IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
# mysqltest has unused result errors, so we skip Werror
@@ -42,6 +43,7 @@
ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
ENDIF()
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ENDIF() +ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
@@ -47,15 +49,19 @@ @@ -53,15 +55,19 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -32,7 +36,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -72,7 +78,7 @@ @@ -78,7 +84,7 @@
MYSQL_ADD_EXECUTABLE(echo echo.c) MYSQL_ADD_EXECUTABLE(echo echo.c)
ENDIF(WIN32) ENDIF(WIN32)

6
databases/mysql55-server/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 5.5.40 PORTVERSION= 5.5.41
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITES= ${MASTER_SITE_MYSQL}
@ -72,7 +72,7 @@ USE_RC_SUBR= mysql-server
USERS= mysql USERS= mysql
GROUPS= 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.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_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 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
@ -83,6 +83,6 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
.include <bsd.port.mk> .include <bsd.port.mk>

4
databases/mysql55-server/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA256 (mysql-5.5.41.tar.gz) = ec642fc5be5ea03b24a0c5189204675fb3794dee772314ace650623c1c994844
SIZE (mysql-5.5.40.tar.gz) = 21727672 SIZE (mysql-5.5.41.tar.gz) = 21768300

11
databases/mysql55-server/files/patch-client_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200 --- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000
+++ client/CMakeLists.txt 2011-10-07 11:06:21.000000000 +0200 +++ client/CMakeLists.txt 2014-12-03 09:23:56.610710083 +0000
@@ -27,17 +27,20 @@ @@ -27,11 +27,13 @@
ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${READLINE_DEFINES})
ADD_DEFINITIONS(${SSL_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES})
@ -14,6 +14,7 @@
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -44,6 +46,7 @@
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
@ -21,7 +22,7 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -46,17 +49,21 @@ @@ -52,17 +55,21 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@ -43,7 +44,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
@@ -66,13 +73,14 @@ @@ -72,13 +79,14 @@
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)