From nobody Thu Jun 30 19:37:47 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5AEC88A3FD6; Thu, 30 Jun 2022 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYpWv1zv9z4l78; Thu, 30 Jun 2022 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656617867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8uypPKmO0r+GQj3uC65UiAgo0S29ujM3870uOBEid5E=; b=EHWsfJtsKy1ujIXb4j2KrAy73Qta4bM7vkR6z8Fk+tKONRqX/mI90tGw40QmNRs5vrRGod khYZG9v/cGkVEKag+kBZHnv/zMZZqPqrQjDPQEMGp1fxhrf06k/xZBOT9DmbFRDAr5Bdgt tQ1I58m0ihc7HOGqMX2bVWqD3Z2ZzO9KyKLy8XTu8pqt1xJB1e3MQmrhy79CmvN4QK+Yc9 nVcmL6rkCqGdgSXmL7K69R0p0qb73hfBEwp1nmV/VN9s8cXIzOK8PlRhzp5UW5ny8kvtZS JXAIj9BtzN0IKIUh5ESx1xj3xYLVCJGyqYXiHI6eS0aZp1tTpPFhcFTqPRNJZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 243344B2E; Thu, 30 Jun 2022 19:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25UJbl6K086439; Thu, 30 Jun 2022 19:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UJblli086438; Thu, 30 Jun 2022 19:37:47 GMT (envelope-from git) Date: Thu, 30 Jun 2022 19:37:47 GMT Message-Id: <202206301937.25UJblli086438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 6fcb7301e2a5 - main - cleanup: Remove expired ports: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fcb7301e2a5cc0c3586a5f826e5a82613de7822 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656617867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8uypPKmO0r+GQj3uC65UiAgo0S29ujM3870uOBEid5E=; b=b+zkkFohreApVHRSl6U/mPkFeXGtefMpXpzLs9jAnmbsWIaNiZDGgAq+UT6kY3+WHNieQx HRJyU1xUYgClcgieLOSLTF1qA1M7Yu+Z73rsCjYIHnxQavzCHAqQdYsTlMPThULbPPWAUL dPpsrTISoOHG6NB0m0aza9Fjrplm6F4j30VHOXEfTd8oa7abwwZrRpEsaZEwSuDMy6O1eZ JjaD4Q+hvYSHZcCpWkxvaGZkHDQnqFEPbpXN322RjC4CB1CbIq6PLbHF6268Rq/VKF1x9X vWLPMwGd4hQSAlWEPtdBfQNWMDw2LcsTmn6zXHU3NvB8NoxQiCuYEsjm3phFcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656617867; a=rsa-sha256; cv=none; b=j8a2EIgBslI2UeDfEOIRpF05Uw6vD2liykGYZOa/NuwlDrOMoA5Qj89FRkoepK4N/W+vux L1bJx0JSZR5/b636CEq9MblAIQ1awS0kTvvzUz1J6KWIex4DzXpQKp6oXsPJ9tTBhuM7sF JF5NH5nbyeWPHKQnkQJ1ZGAtzDfBGlJ59JWLCJBEYRg0EdS50fjPPWmqAd30vS6QtzQ1lJ y3hnAb7e+SPKJE+SKFv+LNiyhiais3uTm4iAXmF6IH6b3vQOY/7tO6y3KvyZOyOXlPCjLq lZqcS4MkrSEUKKv1tjQz445Y/BXsbixKcnLzxGhrmPPfdhL55SnHKfbDGsYhUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fcb7301e2a5cc0c3586a5f826e5a82613de7822 commit 6fcb7301e2a5cc0c3586a5f826e5a82613de7822 Author: Rene Ladan AuthorDate: 2022-06-30 19:37:27 +0000 Commit: Rene Ladan CommitDate: 2022-06-30 19:37:40 +0000 cleanup: Remove expired ports: 2022-06-30 databases/percona56-server: EOL since February 2021 2022-06-30 databases/percona56-client: EOL since February 2021 2022-06-30 databases/mysql55-server: Upstream support ended on December 2018 2022-06-30 databases/mysql55-client: Upstream support ended on December 2018 --- MOVED | 4 + databases/Makefile | 4 - databases/mysql55-client/Makefile | 28 ---- .../mysql55-client/files/patch-CMakeLists.txt | 72 --------- .../files/patch-client_CMakeLists.txt | 47 ------ .../files/patch-extra_CMakeLists.txt | 25 --- .../files/patch-include_CMakeLists.txt | 12 -- .../files/patch-include_my_compare.h | 11 -- .../mysql55-client/files/patch-include_myisam.h | 11 -- .../mysql55-client/files/patch-man_CMakeLists.txt | 13 -- .../mysql55-client/files/patch-mysys_default.c | 31 ---- .../files/patch-scripts_CMakeLists.txt | 78 --------- .../files/patch-sql_common_client_plugin.c | 47 ------ .../files/patch-support-files_CMakeLists.txt | 41 ----- databases/mysql55-client/pkg-message | 17 -- databases/mysql55-client/pkg-plist | 85 ---------- databases/mysql55-server/Makefile | 101 ------------ databases/mysql55-server/distinfo | 3 - .../files/extra-patch-config.h.cmake | 12 -- databases/mysql55-server/files/mysql-server.in | 67 -------- .../mysql55-server/files/patch-CMakeLists.txt | 49 ------ .../files/patch-client_CMakeLists.txt | 62 -------- .../mysql55-server/files/patch-client_mysql.cc | 25 --- .../mysql55-server/files/patch-cmake_plugin.cmake | 10 -- .../files/patch-extra_CMakeLists.txt | 12 -- .../files/patch-include_CMakeLists.txt | 10 -- .../files/patch-include_my_compare.h | 11 -- .../mysql55-server/files/patch-include_myisam.h | 11 -- .../files/patch-libmysql_CMakeLists.txt | 39 ----- .../files/patch-libservices_CMakeLists.txt | 9 -- .../mysql55-server/files/patch-man_CMakeLists.txt | 11 -- .../mysql55-server/files/patch-mysys_default.c | 31 ---- .../files/patch-scripts_CMakeLists.txt | 37 ----- .../files/patch-scripts_mysqld_safe.sh | 24 --- .../mysql55-server/files/patch-sql_CMakeLists.txt | 18 --- .../files/patch-sql_common_client_plugin.c | 47 ------ .../files/patch-sql_sql_partition.cc | 11 -- .../mysql55-server/files/patch-sql_sql_trigger.cc | 50 ------ .../mysql55-server/files/patch-sql_sql_view.cc | 63 -------- .../mysql55-server/files/patch-sql_sys_vars.cc | 38 ----- .../files/patch-support-files_CMakeLists.txt | 12 -- databases/mysql55-server/pkg-descr | 4 - databases/mysql55-server/pkg-message | 8 - databases/mysql55-server/pkg-plist | 136 ---------------- databases/percona56-client/Makefile | 38 ----- .../percona56-client/files/patch-CMakeLists.txt | 74 --------- .../files/patch-client_CMakeLists.txt | 44 ----- .../percona56-client/files/patch-client__mysql.cc | 16 -- .../percona56-client/files/patch-client_mysql.cc | 25 --- .../files/patch-cmake_readline.cmake | 17 -- .../files/patch-extra_CMakeLists.txt | 24 --- .../files/patch-include_my_compare.h | 11 -- .../percona56-client/files/patch-include_myisam.h | 11 -- .../files/patch-man_CMakeLists.txt | 13 -- .../files/patch-mysys__posix_timers.c | 32 ---- .../files/patch-mysys_ssl_my_default.cc | 31 ---- .../files/patch-scripts_CMakeLists.txt | 93 ----------- .../files/patch-sql-common_client.c | 38 ----- .../files/patch-support-files_CMakeLists.txt | 40 ----- .../percona56-client/files/patch-vio_viosocket.c | 13 -- .../files/patch-vio_viosslfactories.c | 20 --- databases/percona56-client/pkg-message | 16 -- databases/percona56-client/pkg-plist | 114 ------------- databases/percona56-server/Makefile | 118 -------------- databases/percona56-server/distinfo | 3 - .../files/extra-patch-config.h.cmake | 29 ---- databases/percona56-server/files/extrapatch-tokudb | 92 ----------- databases/percona56-server/files/mysql-server.in | 67 -------- .../percona56-server/files/patch-CMakeLists.txt | 49 ------ .../files/patch-client_CMakeLists.txt | 65 -------- .../percona56-server/files/patch-client_mysql.cc | 25 --- .../files/patch-cmake_plugin.cmake | 12 -- .../files/patch-cmake_readline.cmake | 17 -- .../files/patch-extra_CMakeLists.txt | 13 -- .../files/patch-include_CMakeLists.txt | 15 -- .../files/patch-include_my_compare.h | 11 -- .../percona56-server/files/patch-include_myisam.h | 11 -- .../files/patch-libmysql_CMakeLists.txt | 43 ----- .../files/patch-libservices_CMakeLists.txt | 9 -- .../files/patch-man_CMakeLists.txt | 11 -- .../files/patch-mysys__posix_timers.c | 32 ---- .../files/patch-mysys_ssl_my_default.cc | 31 ---- ...plugin_password_validation_validate_password.cc | 11 -- .../files/patch-scripts_CMakeLists.txt | 38 ----- .../files/patch-scripts_mysqld_safe.sh | 24 --- .../files/patch-sql-common_client.c | 38 ----- .../files/patch-sql_CMakeLists.txt | 18 --- .../percona56-server/files/patch-sql_mysqld.cc | 19 --- .../percona56-server/files/patch-sql_sys_vars.cc | 38 ----- .../files/patch-support-files_CMakeLists.txt | 12 -- .../percona56-server/files/patch-vio_viosocket.c | 13 -- .../files/patch-vio_viosslfactories.c | 20 --- databases/percona56-server/pkg-descr | 4 - databases/percona56-server/pkg-message | 8 - databases/percona56-server/pkg-plist | 177 --------------------- 95 files changed, 4 insertions(+), 3176 deletions(-) diff --git a/MOVED b/MOVED index 8892383ae7a0..52dab37db534 100644 --- a/MOVED +++ b/MOVED @@ -17354,3 +17354,7 @@ devel/erlang-pooler||2022-06-08|Remove expired ports. Use mix or rebar3 build to devel/erlang-sbroker||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead devel/erlang-syslog||2022-06-08|Remove expired ports. Use mix or rebar3 build tools instead www/py-graphite-web||2022-06-30|Has expired: No support for newer versions of Django +databases/percona56-server||2022-06-30|Has expired: EOL since February 2021 +databases/percona56-client||2022-06-30|Has expired: EOL since February 2021 +databases/mysql55-server||2022-06-30|Has expired: Upstream support ended on December 2018 +databases/mysql55-client||2022-06-30|Has expired: Upstream support ended on December 2018 diff --git a/databases/Makefile b/databases/Makefile index e07b3bcb9445..d355f483afe6 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -204,8 +204,6 @@ SUBDIR += mysql-q4m SUBDIR += mysql-udf SUBDIR += mysql2pgsql - SUBDIR += mysql55-client - SUBDIR += mysql55-server SUBDIR += mysql56-client SUBDIR += mysql56-server SUBDIR += mysql57-client @@ -550,8 +548,6 @@ SUBDIR += pecl-rrd SUBDIR += percona-pam-for-mysql SUBDIR += percona-toolkit - SUBDIR += percona56-client - SUBDIR += percona56-server SUBDIR += percona57-client SUBDIR += percona57-pam-for-mysql SUBDIR += percona57-server diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile deleted file mode 100644 index 71a2242332c2..000000000000 --- a/databases/mysql55-client/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: Alex Dupre - -PORTNAME= mysql -PKGNAMESUFFIX= 55-client - -COMMENT= Multithreaded SQL database (client) - -MASTERDIR= ${.CURDIR}/../mysql55-server - -PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= mysql5[0-46-9]-client \ - mariadb*-client \ - percona*-client - -CMAKE_ARGS+= -DWITHOUT_SERVER=1 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 - -CLIENT_ONLY= yes - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt deleted file mode 100644 index 3b289cf4f0a6..000000000000 --- a/databases/mysql55-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,72 +0,0 @@ ---- 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) --IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) -- ADD_SUBDIRECTORY(client) -- ADD_SUBDIRECTORY(sql) -- ADD_SUBDIRECTORY(sql/share) -- ADD_SUBDIRECTORY(libservices) -- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) -- IF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) -- ENDIF(WITH_EMBEDDED_SERVER) -- -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) -- ADD_SUBDIRECTORY(support-files) -- ADD_SUBDIRECTORY(scripts) -- ADD_SUBDIRECTORY(sql-bench) -- IF(UNIX) -- ADD_SUBDIRECTORY(man) -- ENDIF() -- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) -- ADD_SUBDIRECTORY(internal) -- ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-oel) -- ADD_SUBDIRECTORY(packaging/rpm-sles) -- ADD_SUBDIRECTORY(packaging/rpm-docker) --ENDIF() -+ADD_SUBDIRECTORY(client) -+ADD_SUBDIRECTORY(libservices) -+ADD_SUBDIRECTORY(support-files) -+ADD_SUBDIRECTORY(scripts) -+ADD_SUBDIRECTORY(man) - - INCLUDE(cmake/abi_check.cmake) - INCLUDE(cmake/tags.cmake) -@@ -453,19 +431,21 @@ - ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() -+IF(FALSE) - ADD_SUBDIRECTORY(packaging/WiX) - ADD_SUBDIRECTORY(packaging/solaris) -+ENDIF() - - # Create a single package with "make package" - # (see http://public.kitware.com/Bug/view.php?id=11452) - SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - - IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -491,6 +471,7 @@ - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mysql55-client/files/patch-client_CMakeLists.txt b/databases/mysql55-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 74f289fce78c..000000000000 --- a/databases/mysql55-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ ---- client/CMakeLists.txt.orig 2014-11-04 07:49:50.000000000 +0000 -+++ client/CMakeLists.txt 2014-12-03 09:22:09.860599069 +0000 -@@ -33,6 +33,7 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - # mysqltest has unused result errors, so we skip Werror -@@ -42,6 +43,7 @@ - ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error") - ENDIF() - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) -+ENDIF() - - - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -78,7 +84,7 @@ - MYSQL_ADD_EXECUTABLE(echo echo.c) - ENDIF(WIN32) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mysql55-client/files/patch-extra_CMakeLists.txt b/databases/mysql55-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 78a301146b95..000000000000 --- a/databases/mysql55-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- extra/CMakeLists.txt.orig 2010-12-03 18:58:24.000000000 +0100 -+++ extra/CMakeLists.txt 2010-12-23 14:45:36.000000000 +0100 -@@ -50,6 +50,7 @@ - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys - ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -69,11 +70,14 @@ - - MYSQL_ADD_EXECUTABLE(replace replace.c) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) - - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) diff --git a/databases/mysql55-client/files/patch-include_CMakeLists.txt b/databases/mysql55-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 02ae2db9f708..000000000000 --- a/databases/mysql55-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - typelib.h -- mysql/plugin.h -- mysql/plugin_audit.h -- mysql/plugin_ftparser.h - ) - - SET(HEADERS diff --git a/databases/mysql55-client/files/patch-include_my_compare.h b/databases/mysql55-client/files/patch-include_my_compare.h deleted file mode 100644 index 093c8ae37789..000000000000 --- a/databases/mysql55-client/files/patch-include_my_compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200 -+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200 -@@ -39,7 +39,7 @@ - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 16 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mysql55-client/files/patch-include_myisam.h b/databases/mysql55-client/files/patch-include_myisam.h deleted file mode 100644 index 450645400dd5..000000000000 --- a/databases/mysql55-client/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 -+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 -@@ -48,7 +48,7 @@ - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) diff --git a/databases/mysql55-client/files/patch-man_CMakeLists.txt b/databases/mysql55-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 0f79f3e2403d..000000000000 --- a/databases/mysql55-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 -@@ -15,10 +15,6 @@ - - # Copy man pages - FILE(GLOB MAN1_FILES *.1) --FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN8_FILES *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) - IF(MAN1_EXCLUDE) - LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/mysql55-client/files/patch-mysys_default.c b/databases/mysql55-client/files/patch-mysys_default.c deleted file mode 100644 index 816105371bdf..000000000000 --- a/databases/mysql55-client/files/patch-mysys_default.c +++ /dev/null @@ -1,31 +0,0 @@ ---- mysys/default.c.orig 2010-11-02 23:01:13.000000000 +0100 -+++ mysys/default.c 2010-11-10 16:39:51.000000000 +0100 -@@ -70,7 +70,7 @@ - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -711,7 +711,7 @@ - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -1153,7 +1153,10 @@ - - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) -+ { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); -+ } - #endif /* DEFAULT_SYSCONFDIR */ - - #endif diff --git a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt b/databases/mysql55-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 4dd4080c4f5f..000000000000 --- a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ scripts/CMakeLists.txt 2011-01-11 20:18:07.000000000 +0100 -@@ -71,6 +71,7 @@ - ) - ENDIF() - -+IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -79,6 +80,7 @@ - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server - ) -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -138,6 +140,7 @@ - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -174,6 +177,7 @@ - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -198,6 +202,7 @@ - SET(localstatedir ${MYSQL_DATADIR}) - ENDIF() - -+IF() - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -215,6 +220,7 @@ - DESTINATION ${DEST} - COMPONENT Server - ) -+ENDIF() - - - SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -266,6 +272,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -318,18 +326,9 @@ - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_fix_extensions -- mysql_setpermission -- mysql_secure_installation -- mysql_zap - mysqlaccess - mysqlaccess.conf -- mysql_convert_table_format - mysql_find_rows -- mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) diff --git a/databases/mysql55-client/files/patch-sql_common_client_plugin.c b/databases/mysql55-client/files/patch-sql_common_client_plugin.c deleted file mode 100644 index 069eaef76e11..000000000000 --- a/databases/mysql55-client/files/patch-sql_common_client_plugin.c +++ /dev/null @@ -1,47 +0,0 @@ ---- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC -+++ sql-common/client_plugin.c -@@ -233,11 +233,13 @@ - { - MYSQL mysql; - struct st_mysql_client_plugin **builtin; -+ va_list unused; - - if (initialized) - return 0; - - bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ - - pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); - init_alloc_root(&mem_root, 128, 128); -@@ -249,7 +251,7 @@ - pthread_mutex_lock(&LOCK_load_client_plugin); - - for (builtin= mysql_client_builtins; *builtin; builtin++) -- add_plugin(&mysql, *builtin, 0, 0, 0); -+ add_plugin(&mysql, *builtin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - -@@ -293,9 +295,12 @@ - mysql_client_register_plugin(MYSQL *mysql, - struct st_mysql_client_plugin *plugin) - { -+ va_list unused; - if (is_not_initialized(mysql, plugin->name)) - return NULL; - -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ -+ - pthread_mutex_lock(&LOCK_load_client_plugin); - - /* make sure the plugin wasn't loaded meanwhile */ -@@ -307,7 +312,7 @@ - plugin= NULL; - } - else -- plugin= add_plugin(mysql, plugin, 0, 0, 0); -+ plugin= add_plugin(mysql, plugin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - return plugin; diff --git a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt b/databases/mysql55-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index e9d1405d119f..000000000000 --- a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-03-18 05:41:10.000000000 +0100 -+++ support-files/CMakeLists.txt 2017-04-12 19:03:14.636331000 +0200 -@@ -40,12 +40,14 @@ - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) - ENDFOREACH() -+ENDIF() - - IF(UNIX) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") -@@ -54,6 +56,7 @@ - SET (PIDOF "pgrep -d' ' -f") - 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 @@ - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() -+ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+IF(FALSE) - 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) - -@@ -99,3 +104,4 @@ - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() diff --git a/databases/mysql55-client/pkg-message b/databases/mysql55-client/pkg-message deleted file mode 100644 index 0d8d7d73c6c0..000000000000 --- a/databases/mysql55-client/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -[ -{ type: install - message: < - -PORTNAME?= mysql -PORTVERSION= 5.5.62 -PORTREVISION?= 3 -CATEGORIES= databases -MASTER_SITES= MYSQL/MySQL-5.5 -PKGNAMESUFFIX?= 55-server - -MAINTAINER= ale@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) - -LICENSE= GPLv2 - -DEPRECATED= Upstream support ended on December 2018 -EXPIRATION_DATE= 2022-06-30 - -SLAVEDIRS= databases/mysql55-client -USES= cmake:insource,noninja compiler:c++11-lang cpe readline shebangfix -CXXFLAGS+= ${CPPFLAGS} -NO_OPTIONS_SORT=yes - -CPE_VENDOR= oracle - -OPTIONS_DEFINE= SSL FASTMTX -OPTIONS_DEFAULT=SSL - -FASTMTX_DESC= Replace mutexes with spinlocks - -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INCLUDEDIR="include/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="share/man" \ - -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SQLBENCHDIR="share/mysql" \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBEDIT=0 \ - -DWITH_LIBWRAP=1 - -SHEBANG_FILES= scripts/*.pl* scripts/*.sh - -.ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif - -.include - -.if ${PORT_OPTIONS:MSSL} -CMAKE_ARGS+= -DWITH_SSL=bundled -.endif -.if ${PORT_OPTIONS:MFASTMTX} -CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 -.endif - -# MySQL-Server part -.if !defined(CLIENT_ONLY) -USES+= mysql:55 - -CONFLICTS_INSTALL= mysql*-server \ - mysqlwsrep*-server \ - mariadb*-server \ - percona*-server - -USE_RC_SUBR= mysql-server - -USERS= mysql -GROUPS= mysql - -MMAN1= 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 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ - perror.1 replace.1 resolve_stack_dump.1 resolveip.1 - -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -.endif - -post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt - -post-install: - # Empty directory, but check-plist complains - @${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE} - -.include - -.if ${ARCH} == armv6 || ${ARCH} == armv7 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake -.endif - -.include diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo deleted file mode 100644 index 052db61350b5..000000000000 --- a/databases/mysql55-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1540551076 -SHA256 (mysql-5.5.62.tar.gz) = b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7 -SIZE (mysql-5.5.62.tar.gz) = 21111902 diff --git a/databases/mysql55-server/files/extra-patch-config.h.cmake b/databases/mysql55-server/files/extra-patch-config.h.cmake deleted file mode 100644 index 3ac1add1b9ce..000000000000 --- a/databases/mysql55-server/files/extra-patch-config.h.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.cmake.orig 2014-12-05 16:24:02 UTC -+++ config.h.cmake -@@ -151,7 +151,8 @@ - #cmakedefine HAVE_FESETROUND 1 - #cmakedefine HAVE_FINITE 1 - #cmakedefine HAVE_FP_EXCEPT 1 --#cmakedefine HAVE_FPSETMASK 1 -+#cmakedefine HAVE_FPSETMASK 0 -+#cmakedefine HAVE_FEDISABLEEXCEPT 1 - #cmakedefine HAVE_FSEEKO 1 - #cmakedefine HAVE_FSYNC 1 - #cmakedefine HAVE_FTIME 1 diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in deleted file mode 100644 index 5bd18d2d68c8..000000000000 --- a/databases/mysql55-server/files/mysql-server.in +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_dbdir (str): Default to "/var/db/mysql" -# Base database directory. -# mysql_optfile (str): Server-specific option file. -# Default to "${mysql_dbdir}/my.cnf". -# mysql_pidfile (str): Custum PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} - -mysql_user="mysql" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null - [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mysql55-server/files/patch-CMakeLists.txt b/databases/mysql55-server/files/patch-CMakeLists.txt deleted file mode 100644 index 59e1a4126599..000000000000 --- a/databases/mysql55-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 -+++ CMakeLists.txt 2013-06-12 09:41:06.000000000 +0200 -@@ -306,7 +306,6 @@ - - ADD_SUBDIRECTORY(extra) - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) -@@ -314,14 +313,10 @@ - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) -- ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) *** 2891 LINES SKIPPED ***