aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2015-11-19 16:24:02 +0800
committerale <ale@FreeBSD.org>2015-11-19 16:24:02 +0800
commitaf065d53afd51d8b304fdc6976a0c1cca4a14b35 (patch)
treef5c9178ace0c67c5d06264d14e1082f109199c37 /databases
parent573cea211285dd6f664952b22b96d2ed22c0a34b (diff)
downloadfreebsd-ports-gnome-af065d53afd51d8b304fdc6976a0c1cca4a14b35.tar.gz
freebsd-ports-gnome-af065d53afd51d8b304fdc6976a0c1cca4a14b35.tar.zst
freebsd-ports-gnome-af065d53afd51d8b304fdc6976a0c1cca4a14b35.zip
Update to 5.5.46 release.
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql55-client/Makefile1
-rw-r--r--databases/mysql55-client/files/patch-CMakeLists.txt11
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql55-server/distinfo4
4 files changed, 9 insertions, 9 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index a8d047e42a8c..7c85c69ec3bb 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -2,7 +2,6 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 1
PKGNAMESUFFIX= 55-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
index 20747541d5a7..3b289cf4f0a6 100644
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2014-11-04 07:49:52.000000000 +0000
-+++ CMakeLists.txt 2014-12-03 09:20:45.966491617 +0000
-@@ -387,32 +387,11 @@
+--- CMakeLists.txt.orig 2015-06-25 13:44:36.000000000 +0000
++++ CMakeLists.txt 2015-09-19 07:48:14.145882685 +0000
+@@ -390,33 +390,11 @@
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -29,6 +29,7 @@
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-sles)
+- ADD_SUBDIRECTORY(packaging/rpm-docker)
-ENDIF()
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(libservices)
@@ -38,7 +39,7 @@
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
-@@ -448,19 +427,21 @@
+@@ -453,19 +431,21 @@
ELSE()
SET(CPACK_GENERATOR "TGZ")
ENDIF()
@@ -61,7 +62,7 @@
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
-@@ -486,6 +467,7 @@
+@@ -491,6 +471,7 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 1b5bc66d3533..640d4ede559f 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.5.44
+PORTVERSION= 5.5.46
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.5
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 5464f183b3aa..b443a0dc4db2 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.44.tar.gz) = 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de
-SIZE (mysql-5.5.44.tar.gz) = 21789766
+SHA256 (mysql-5.5.46.tar.gz) = 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e
+SIZE (mysql-5.5.46.tar.gz) = 21838374