summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/mysql55-client/Makefile1
-rw-r--r--databases/mysql55-client/files/patch-include_CMakeLists.txt12
-rw-r--r--databases/mysql55-client/files/patch-scripts_mysql_config.sh15
-rw-r--r--databases/mysql55-client/files/patch-support-files_CMakeLists.txt16
-rw-r--r--databases/mysql55-client/pkg-plist1
-rw-r--r--databases/mysql55-server/Makefile8
-rw-r--r--databases/mysql55-server/distinfo4
-rw-r--r--databases/mysql55-server/files/patch-include_CMakeLists.txt10
-rw-r--r--databases/percona55-client/Makefile1
-rw-r--r--databases/percona55-client/files/patch-include_CMakeLists.txt12
-rw-r--r--databases/percona55-client/files/patch-scripts_mysql_config.sh15
-rw-r--r--databases/percona55-client/files/patch-support-files_CMakeLists.txt16
-rw-r--r--databases/percona55-client/pkg-plist1
-rw-r--r--databases/percona55-server/Makefile8
-rw-r--r--databases/percona55-server/distinfo4
-rw-r--r--databases/percona55-server/files/patch-include_CMakeLists.txt10
16 files changed, 38 insertions, 96 deletions
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 861f8358076d..fb471d1dea78 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= mysql
-PORTREVISION= 2
PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql55-client/files/patch-include_CMakeLists.txt b/databases/mysql55-client/files/patch-include_CMakeLists.txt
index 58c94b7e542b..02ae2db9f708 100644
--- a/databases/mysql55-client/files/patch-include_CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-include_CMakeLists.txt
@@ -1,5 +1,5 @@
---- include/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100
-+++ include/CMakeLists.txt 2010-12-23 16:16:14.000000000 +0100
+--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt 2011-02-07 22:42:05.129894470 +0100
@@ -27,9 +27,6 @@
my_list.h
my_alloc.h
@@ -10,11 +10,3 @@
)
SET(HEADERS
-@@ -59,6 +56,6 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
-+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-
-
diff --git a/databases/mysql55-client/files/patch-scripts_mysql_config.sh b/databases/mysql55-client/files/patch-scripts_mysql_config.sh
deleted file mode 100644
index 20c6646dac34..000000000000
--- a/databases/mysql55-client/files/patch-scripts_mysql_config.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- scripts/mysql_config.sh.orig 2010-12-23 15:57:56.000000000 +0100
-+++ scripts/mysql_config.sh 2010-12-23 15:58:49.000000000 +0100
-@@ -92,7 +92,11 @@
- fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
-
- pkgincludedir='@pkgincludedir@'
--fix_path pkgincludedir include/mysql include
-+if [ -f "$basedir/include/mysql/mysql.h" ]; then
-+ pkgincludedir="$basedir/include/mysql"
-+elif [ -f "$basedir/include/mysql.h" ]; then
-+ pkgincludedir="$basedir/include"
-+fi
-
- version='@VERSION@'
- socket='@MYSQL_UNIX_ADDR@'
diff --git a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt b/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
index 283d969747f8..e3490b326b03 100644
--- a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig 2010-12-23 13:26:23.000000000 +0100
-+++ support-files/CMakeLists.txt 2010-12-23 13:29:45.000000000 +0100
-@@ -40,12 +40,14 @@
+--- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100
++++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100
+@@ -40,15 +40,18 @@
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
@@ -14,16 +14,12 @@
+ENDIF()
IF(UNIX)
- # XXX: again, used elsewhere (scripts/), should be standardised in
-@@ -56,6 +58,7 @@
- SET(prefix ${CMAKE_INSTALL_PREFIX})
- ENDIF()
-
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
+IF(FALSE)
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
-@@ -73,8 +76,10 @@
+@@ -66,8 +69,10 @@
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()
@@ -34,7 +30,7 @@
CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
-@@ -92,3 +97,4 @@
+@@ -85,3 +90,4 @@
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()
diff --git a/databases/mysql55-client/pkg-plist b/databases/mysql55-client/pkg-plist
index 9949a27a50e9..7322ec5e5bf2 100644
--- a/databases/mysql55-client/pkg-plist
+++ b/databases/mysql55-client/pkg-plist
@@ -27,7 +27,6 @@ include/mysql/my_getopt.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
-include/mysql/my_no_pthread.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/my_xml.h
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 8b0d578e7852..8b4446a85c4e 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.5.8
-PORTREVISION?= 3
+PORTVERSION= 5.5.9
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5
@@ -37,7 +37,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_SCRIPTDIR="bin" \
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR="share/mysql" \
- -DINSTALL_SUPPORTFILESDIR="share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DWITH_LIBEDIT=0 \
+ -DWITH_LIBWRAP=1
.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 5d5dbc17dc04..db409359c7ba 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.8.tar.gz) = e1175da267e8124507d69a259e144e59043f03e7a7cff81185f412cb1d6bcda2
-SIZE (mysql-5.5.8.tar.gz) = 24258297
+SHA256 (mysql-5.5.9.tar.gz) = 2352ec7103aa302619242eb8f20fd3b7a12ba8abc55076ac7285b4d845cc96fd
+SIZE (mysql-5.5.9.tar.gz) = 23841228
diff --git a/databases/mysql55-server/files/patch-include_CMakeLists.txt b/databases/mysql55-server/files/patch-include_CMakeLists.txt
index e25615d59e0e..2478ae5fa6e3 100644
--- a/databases/mysql55-server/files/patch-include_CMakeLists.txt
+++ b/databases/mysql55-server/files/patch-include_CMakeLists.txt
@@ -1,12 +1,10 @@
---- include/CMakeLists.txt.orig 2010-12-23 16:09:41.000000000 +0100
-+++ include/CMakeLists.txt 2010-12-23 16:10:01.000000000 +0100
-@@ -58,7 +58,9 @@
+--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100
+@@ -57,5 +57,7 @@
${HEADERS_GEN_CONFIGURE}
)
+IF(FALSE)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
+ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ENDIF()
-
-
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 861f8358076d..fb471d1dea78 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= mysql
-PORTREVISION= 2
PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/percona55-client/files/patch-include_CMakeLists.txt b/databases/percona55-client/files/patch-include_CMakeLists.txt
index 58c94b7e542b..02ae2db9f708 100644
--- a/databases/percona55-client/files/patch-include_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-include_CMakeLists.txt
@@ -1,5 +1,5 @@
---- include/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100
-+++ include/CMakeLists.txt 2010-12-23 16:16:14.000000000 +0100
+--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt 2011-02-07 22:42:05.129894470 +0100
@@ -27,9 +27,6 @@
my_list.h
my_alloc.h
@@ -10,11 +10,3 @@
)
SET(HEADERS
-@@ -59,6 +56,6 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
-+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-
-
diff --git a/databases/percona55-client/files/patch-scripts_mysql_config.sh b/databases/percona55-client/files/patch-scripts_mysql_config.sh
deleted file mode 100644
index 20c6646dac34..000000000000
--- a/databases/percona55-client/files/patch-scripts_mysql_config.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- scripts/mysql_config.sh.orig 2010-12-23 15:57:56.000000000 +0100
-+++ scripts/mysql_config.sh 2010-12-23 15:58:49.000000000 +0100
-@@ -92,7 +92,11 @@
- fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
-
- pkgincludedir='@pkgincludedir@'
--fix_path pkgincludedir include/mysql include
-+if [ -f "$basedir/include/mysql/mysql.h" ]; then
-+ pkgincludedir="$basedir/include/mysql"
-+elif [ -f "$basedir/include/mysql.h" ]; then
-+ pkgincludedir="$basedir/include"
-+fi
-
- version='@VERSION@'
- socket='@MYSQL_UNIX_ADDR@'
diff --git a/databases/percona55-client/files/patch-support-files_CMakeLists.txt b/databases/percona55-client/files/patch-support-files_CMakeLists.txt
index 283d969747f8..e3490b326b03 100644
--- a/databases/percona55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/percona55-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig 2010-12-23 13:26:23.000000000 +0100
-+++ support-files/CMakeLists.txt 2010-12-23 13:29:45.000000000 +0100
-@@ -40,12 +40,14 @@
+--- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100
++++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100
+@@ -40,15 +40,18 @@
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
@@ -14,16 +14,12 @@
+ENDIF()
IF(UNIX)
- # XXX: again, used elsewhere (scripts/), should be standardised in
-@@ -56,6 +58,7 @@
- SET(prefix ${CMAKE_INSTALL_PREFIX})
- ENDIF()
-
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
+IF(FALSE)
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
-@@ -73,8 +76,10 @@
+@@ -66,8 +69,10 @@
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()
@@ -34,7 +30,7 @@
CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
-@@ -92,3 +97,4 @@
+@@ -85,3 +90,4 @@
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()
diff --git a/databases/percona55-client/pkg-plist b/databases/percona55-client/pkg-plist
index 9949a27a50e9..7322ec5e5bf2 100644
--- a/databases/percona55-client/pkg-plist
+++ b/databases/percona55-client/pkg-plist
@@ -27,7 +27,6 @@ include/mysql/my_getopt.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
-include/mysql/my_no_pthread.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/my_xml.h
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 8b0d578e7852..8b4446a85c4e 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.5.8
-PORTREVISION?= 3
+PORTVERSION= 5.5.9
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5
@@ -37,7 +37,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_SCRIPTDIR="bin" \
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR="share/mysql" \
- -DINSTALL_SUPPORTFILESDIR="share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="share/mysql" \
+ -DWITH_LIBEDIT=0 \
+ -DWITH_LIBWRAP=1
.ifdef USE_MYSQL
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 5d5dbc17dc04..db409359c7ba 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.8.tar.gz) = e1175da267e8124507d69a259e144e59043f03e7a7cff81185f412cb1d6bcda2
-SIZE (mysql-5.5.8.tar.gz) = 24258297
+SHA256 (mysql-5.5.9.tar.gz) = 2352ec7103aa302619242eb8f20fd3b7a12ba8abc55076ac7285b4d845cc96fd
+SIZE (mysql-5.5.9.tar.gz) = 23841228
diff --git a/databases/percona55-server/files/patch-include_CMakeLists.txt b/databases/percona55-server/files/patch-include_CMakeLists.txt
index e25615d59e0e..2478ae5fa6e3 100644
--- a/databases/percona55-server/files/patch-include_CMakeLists.txt
+++ b/databases/percona55-server/files/patch-include_CMakeLists.txt
@@ -1,12 +1,10 @@
---- include/CMakeLists.txt.orig 2010-12-23 16:09:41.000000000 +0100
-+++ include/CMakeLists.txt 2010-12-23 16:10:01.000000000 +0100
-@@ -58,7 +58,9 @@
+--- include/CMakeLists.txt.orig 2011-01-19 23:37:08.000000000 +0100
++++ include/CMakeLists.txt 2011-02-07 22:40:32.698758463 +0100
+@@ -57,5 +57,7 @@
${HEADERS_GEN_CONFIGURE}
)
+IF(FALSE)
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h" )
+ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ENDIF()
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 07:33:28 +0000