svn commit: r336716 - in head/databases: mysql56-client mysql56-client/files mysql56-server
Alex Dupre
ale at FreeBSD.org
Tue Dec 17 11:25:13 UTC 2013
Author: ale
Date: Tue Dec 17 11:25:11 2013
New Revision: 336716
URL: http://svnweb.freebsd.org/changeset/ports/336716
Log:
Update to 5.6.15 release and stagify.
Modified:
head/databases/mysql56-client/Makefile
head/databases/mysql56-client/files/patch-CMakeLists.txt
head/databases/mysql56-client/pkg-plist
head/databases/mysql56-server/Makefile
head/databases/mysql56-server/distinfo
head/databases/mysql56-server/pkg-plist
Modified: head/databases/mysql56-client/Makefile
==============================================================================
--- head/databases/mysql56-client/Makefile Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-client/Makefile Tue Dec 17 11:25:11 2013 (r336716)
@@ -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/mysql56-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Dec 17 11:25:11 2013 (r336716)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100
-@@ -378,31 +378,11 @@
+--- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000
++++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000
+@@ -458,33 +458,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,8 @@
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-uln)
+- ADD_SUBDIRECTORY(packaging/rpm-oel)
+- ADD_SUBDIRECTORY(packaging/rpm-fedora)
-ENDIF()
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
@@ -37,7 +39,7 @@
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
-@@ -439,7 +419,6 @@
+@@ -521,18 +499,17 @@
SET(CPACK_GENERATOR "TGZ")
ENDIF()
ADD_SUBDIRECTORY(packaging/WiX)
@@ -45,9 +47,8 @@
# Create a single package with "make package"
# (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -447,11 +426,11 @@
+ SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- INCLUDE(CPack)
IF(UNIX)
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
ENDIF()
@@ -58,8 +59,10 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -477,3 +456,4 @@
+@@ -558,5 +535,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
+
+ INCLUDE(CPack)
Modified: head/databases/mysql56-client/pkg-plist
==============================================================================
--- head/databases/mysql56-client/pkg-plist Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-client/pkg-plist Tue Dec 17 11:25:11 2013 (r336716)
@@ -92,6 +92,21 @@ 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_config_editor.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/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-server/Makefile Tue Dec 17 11:25:11 2013 (r336716)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.6.14
+PORTVERSION= 5.6.15
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -54,8 +54,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 \
@@ -63,15 +61,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"
-
-NO_STAGE= yes
-post-install:
-.if !defined(PACKAGE_BUILDING)
- @${CAT} ${PKGMESSAGE}
-.endif
.endif
post-patch:
Modified: head/databases/mysql56-server/distinfo
==============================================================================
--- head/databases/mysql56-server/distinfo Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-server/distinfo Tue Dec 17 11:25:11 2013 (r336716)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.6.14.tar.gz) = 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7
-SIZE (mysql-5.6.14.tar.gz) = 36005278
+SHA256 (mysql-5.6.15.tar.gz) = f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7
+SIZE (mysql-5.6.15.tar.gz) = 32794954
Modified: head/databases/mysql56-server/pkg-plist
==============================================================================
--- head/databases/mysql56-server/pkg-plist Tue Dec 17 11:07:25 2013 (r336715)
+++ head/databases/mysql56-server/pkg-plist Tue Dec 17 11:25:11 2013 (r336716)
@@ -38,6 +38,33 @@ lib/mysql/plugin/semisync_master.so
lib/mysql/plugin/semisync_slave.so
lib/mysql/plugin/validate_password.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%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
More information about the svn-ports-head
mailing list