aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql55-client/Makefile1
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql55-server/files/patch-scripts_CMakeLists.txt13
-rw-r--r--databases/percona55-client/Makefile1
-rw-r--r--databases/percona55-server/Makefile2
-rw-r--r--databases/percona55-server/files/patch-scripts_CMakeLists.txt13
6 files changed, 26 insertions, 6 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index fb471d1dea78..232a58540748 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= mysql
+PORTREVISION= 0
PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 953df5e26c2d..6000f0b9ebe4 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 5.5.15
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5
diff --git a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt b/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
index c3d2d764e640..de410a1d3549 100644
--- a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
@@ -1,5 +1,5 @@
---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100
-+++ scripts/CMakeLists.txt 2011-01-11 20:20:02.000000000 +0100
+--- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 +0200
++++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200
@@ -266,6 +266,8 @@
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
@@ -26,3 +26,12 @@
mysqlhotcopy
mysqldumpslow
mysqld_multi
+@@ -334,7 +331,7 @@
+ FOREACH(file ${BIN_SCRIPTS})
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index fb471d1dea78..232a58540748 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= mysql
+PORTREVISION= 0
PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 953df5e26c2d..6000f0b9ebe4 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 5.5.15
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5
diff --git a/databases/percona55-server/files/patch-scripts_CMakeLists.txt b/databases/percona55-server/files/patch-scripts_CMakeLists.txt
index c3d2d764e640..de410a1d3549 100644
--- a/databases/percona55-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-scripts_CMakeLists.txt
@@ -1,5 +1,5 @@
---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100
-+++ scripts/CMakeLists.txt 2011-01-11 20:20:02.000000000 +0100
+--- scripts/CMakeLists.txt.orig 2011-07-13 21:09:03.000000000 +0200
++++ scripts/CMakeLists.txt 2011-09-01 09:48:22.000000000 +0200
@@ -266,6 +266,8 @@
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
@@ -26,3 +26,12 @@
mysqlhotcopy
mysqldumpslow
mysqld_multi
+@@ -334,7 +331,7 @@
+ FOREACH(file ${BIN_SCRIPTS})
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)