Date: Tue, 17 Dec 2013 10:18:58 +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: r336708 - in head/databases: mysql55-client mysql55-server mysql55-server/files Message-ID: <201312171018.rBHAIwYp008819@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Tue Dec 17 10:18:58 2013 New Revision: 336708 URL: http://svnweb.freebsd.org/changeset/ports/336708 Log: Update to 5.5.35 release and stagify. Modified: head/databases/mysql55-client/Makefile head/databases/mysql55-client/pkg-plist head/databases/mysql55-server/Makefile head/databases/mysql55-server/distinfo head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt head/databases/mysql55-server/pkg-plist Modified: head/databases/mysql55-client/Makefile ============================================================================== --- head/databases/mysql55-client/Makefile Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-client/Makefile Tue Dec 17 10:18:58 2013 (r336708) @@ -24,5 +24,4 @@ MAN1= comp_err.1 msql2mysql.1 mysql.1 m CLIENT_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql55-client/pkg-plist ============================================================================== --- head/databases/mysql55-client/pkg-plist Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-client/pkg-plist Tue Dec 17 10:18:58 2013 (r336708) @@ -68,6 +68,20 @@ lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 lib/mysql/libmysqlservices.a +man/man1/comp_err.1.gz +man/man1/msql2mysql.1.gz +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 @dirrm include/mysql/mysql/psi @dirrm include/mysql/mysql Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/Makefile Tue Dec 17 10:18:58 2013 (r336708) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.34 +PORTVERSION= 5.5.35 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -48,7 +48,6 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.s .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSSL} @@ -70,8 +69,6 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -INFO= mysql - MAN1= 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 \ @@ -79,14 +76,7 @@ MAN1= my_print_defaults.1 myisam_ftdump mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 -MAN8= mysqld.8 - CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" - -post-install: -.if !defined(PACKAGE_BUILDING) - @${CAT} ${PKGMESSAGE} -.endif .endif post-patch: Modified: head/databases/mysql55-server/distinfo ============================================================================== --- head/databases/mysql55-server/distinfo Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/distinfo Tue Dec 17 10:18:58 2013 (r336708) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.34.tar.gz) = b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 -SIZE (mysql-5.5.34.tar.gz) = 24699724 +SHA256 (mysql-5.5.35.tar.gz) = 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a +SIZE (mysql-5.5.35.tar.gz) = 21707804 Modified: head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt Tue Dec 17 10:18:58 2013 (r336708) @@ -1,6 +1,6 @@ ---- 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-11-05 07:19:26.000000000 +0000 ++++ libmysql/CMakeLists.txt 2013-12-16 14:27:25.505227018 +0000 +@@ -165,7 +165,7 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -8,15 +8,16 @@ +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects - IF(MSVC) - INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + INSTALL_DEBUG_SYMBOLS(clientlib) +@@ -174,6 +174,7 @@ + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() +IF(FALSE) IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -188,9 +189,11 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -29,7 +30,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -237,3 +240,4 @@ ENDFOREACH() ENDIF() ENDIF() Modified: head/databases/mysql55-server/pkg-plist ============================================================================== --- head/databases/mysql55-server/pkg-plist Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/pkg-plist Tue Dec 17 10:18:58 2013 (r336708) @@ -41,6 +41,33 @@ lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so libexec/mysqld +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqltest.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312171018.rBHAIwYp008819>