CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug  5 06:30:35 UTC 2024

Modified Files:
        pkgsrc/databases: Makefile
        pkgsrc/doc: CHANGES-2024
        pkgsrc/mk: mysql.buildlink3.mk
Removed Files:
        pkgsrc/databases/mysql56-client: DESCR MESSAGE Makefile Makefile.common
            PLIST buildlink3.mk distinfo options.mk
        pkgsrc/databases/mysql56-client/patches: patch-CMakeLists.txt
            patch-client_mysqladmin.cc patch-cmake_dtrace.cmake
            patch-cmake_libutils.cmake patch-cmake_os_SunOS.cmake
            patch-cmake_plugin.cmake patch-cmake_readline.cmake
            patch-cmake_ssl.cmake patch-cmd-line-utils_libedit_chartype.h
            patch-cmd-line-utils_libedit_vi.c patch-include_CMakeLists.txt
            patch-include_m__string.h patch-include_my__global.h
            patch-include_my_compare.h patch-include_my_net.h
            patch-include_my_pthread.h patch-libmysql_CMakeLists.txt
            patch-mysql-test_CMakeLists.txt patch-mysys__ssl_CMakeLists.txt
            patch-mysys_stacktrace.c patch-scripts_CMakeLists.txt
            patch-scripts_mysql__install__db.pl.in patch-scripts_mysqld_safe.sh
            patch-sql_CMakeLists.txt patch-sql_sys__vars.cc
            patch-storage_archive_CMakeLists.txt
            patch-storage_blackhole_CMakeLists.txt
            patch-storage_csv_CMakeLists.txt
            patch-storage_example_CMakeLists.txt
            patch-storage_federated_CMakeLists.txt
            patch-storage_heap_CMakeLists.txt
            patch-storage_innobase_handler_i__s.cc
            patch-storage_innobase_include_univ.i
            patch-storage_myisam_CMakeLists.txt
            patch-storage_myisammrg_CMakeLists.txt
            patch-storage_ndb_include_util_Parser.hpp
        pkgsrc/databases/mysql56-server: DEINSTALL DESCR MESSAGE MESSAGE.sphinx
            Makefile PLIST PLIST.SunOS buildlink3.mk
        pkgsrc/databases/mysql56-server/files: mysqld.sh
        pkgsrc/databases/mysql56-server/files/smf: manifest.xml mysqld.sh
        pkgsrc/databases/mysql57-client: DESCR Makefile Makefile.common PLIST
            buildlink3.mk distinfo options.mk
        pkgsrc/databases/mysql57-client/patches: patch-CMakeLists.txt
            patch-client_CMakeLists.txt patch-client_completion_hash.cc
            patch-client_mysqladmin.cc
            patch-cmake_build__configurations_compiler__options.cmake
            patch-cmake_build__configurations_mysql__release.cmake
            patch-cmake_ldap.cmake patch-cmake_os_SunOS.cmake
            patch-cmake_plugin.cmake patch-cmake_readline.cmake
            patch-cmake_ssl.cmake patch-include_CMakeLists.txt
            patch-include_my__compare.h patch-include_my__global.h
            patch-include_my__thread.h patch-include_my__thread__os__id.h
            patch-libmysql_CMakeLists.txt patch-mysql-test_CMakeLists.txt
            patch-mysys__ssl_CMakeLists.txt patch-mysys_kqueue__timers.c
            patch-mysys_mf__iocache2.c patch-mysys_my__symlink.c
            patch-mysys_stacktrace.c
            patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c
            patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c
            patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c
            patch-rapid_plugin_group__replication_rpcgen.cmake
            patch-rapid_plugin_x_CMakeLists.txt patch-scripts_CMakeLists.txt
            patch-scripts_mysqld_safe.sh patch-sql_CMakeLists.txt
            patch-sql_conn__handler_socket__connection.cc
            patch-sql_item__geofunc__internal.cc
            patch-sql_locks_shared__spin__lock.cc patch-sql_log_event.h
            patch-sql_sys__vars.cc patch-storage_archive_CMakeLists.txt
            patch-storage_blackhole_CMakeLists.txt
            patch-storage_csv_CMakeLists.txt
            patch-storage_example_CMakeLists.txt
            patch-storage_federated_CMakeLists.txt
            patch-storage_heap_CMakeLists.txt
            patch-storage_myisam_CMakeLists.txt
            patch-storage_myisammrg_CMakeLists.txt patch-strings_decimal.c
        pkgsrc/databases/mysql57-server: DEINSTALL DESCR MESSAGE MESSAGE.sphinx
            Makefile PLIST PLIST.SunOS buildlink3.mk
        pkgsrc/databases/mysql57-server/files: mysqld.sh
        pkgsrc/databases/mysql57-server/files/smf: manifest.xml mysqld.sh
        pkgsrc/databases/sqlite3: builtin.mk

Log Message:
mysql* 5.6, 5.7: remove

As proposed on pkgsrc-users on July 26.

These versions are unsupported by upstream since 2018 and 2020
respectively.


To generate a diff of this commit:
cvs rdiff -u -r1.715 -r1.716 pkgsrc/databases/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql56-client/DESCR \
    pkgsrc/databases/mysql56-client/PLIST
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql56-client/MESSAGE
cvs rdiff -u -r1.41 -r0 pkgsrc/databases/mysql56-client/Makefile
cvs rdiff -u -r1.60 -r0 pkgsrc/databases/mysql56-client/Makefile.common
cvs rdiff -u -r1.10 -r0 pkgsrc/databases/mysql56-client/buildlink3.mk
cvs rdiff -u -r1.61 -r0 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r1.14 -r0 pkgsrc/databases/mysql56-client/options.mk
cvs rdiff -u -r1.7 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-client_mysqladmin.cc \
    pkgsrc/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h \
    pkgsrc/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c \
    pkgsrc/databases/mysql56-client/patches/patch-include_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-include_m__string.h \
    pkgsrc/databases/mysql56-client/patches/patch-include_my_compare.h \
    pkgsrc/databases/mysql56-client/patches/patch-include_my_pthread.h \
    pkgsrc/databases/mysql56-client/patches/patch-mysql-test_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-mysys_stacktrace.c \
    pkgsrc/databases/mysql56-client/patches/patch-scripts_mysqld_safe.sh \
    pkgsrc/databases/mysql56-client/patches/patch-storage_archive_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_blackhole_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_csv_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_federated_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_heap_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_handler_i__s.cc \
    pkgsrc/databases/mysql56-client/patches/patch-storage_innobase_include_univ.i \
    pkgsrc/databases/mysql56-client/patches/patch-storage_myisam_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_myisammrg_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_ndb_include_util_Parser.hpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_dtrace.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_libutils.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_os_SunOS.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_plugin.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-include_my_net.h \
    pkgsrc/databases/mysql56-client/patches/patch-scripts_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-scripts_mysql__install__db.pl.in \
    pkgsrc/databases/mysql56-client/patches/patch-sql_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-storage_example_CMakeLists.txt
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_readline.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake \
    pkgsrc/databases/mysql56-client/patches/patch-libmysql_CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/databases/mysql56-client/patches/patch-include_my__global.h \
    pkgsrc/databases/mysql56-client/patches/patch-mysys__ssl_CMakeLists.txt \
    pkgsrc/databases/mysql56-client/patches/patch-sql_sys__vars.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql56-server/DEINSTALL \
    pkgsrc/databases/mysql56-server/MESSAGE \
    pkgsrc/databases/mysql56-server/MESSAGE.sphinx \
    pkgsrc/databases/mysql56-server/PLIST.SunOS \
    pkgsrc/databases/mysql56-server/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql56-server/DESCR
cvs rdiff -u -r1.48 -r0 pkgsrc/databases/mysql56-server/Makefile
cvs rdiff -u -r1.40 -r0 pkgsrc/databases/mysql56-server/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mysql56-server/files/mysqld.sh
cvs rdiff -u -r1.6 -r0 pkgsrc/databases/mysql56-server/files/smf/manifest.xml
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql56-server/files/smf/mysqld.sh
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql57-client/DESCR
cvs rdiff -u -r1.51 -r0 pkgsrc/databases/mysql57-client/Makefile
cvs rdiff -u -r1.46 -r0 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.30 -r0 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/databases/mysql57-client/buildlink3.mk
cvs rdiff -u -r1.54 -r0 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/databases/mysql57-client/options.mk
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-sql_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-client_completion_hash.cc \
    pkgsrc/databases/mysql57-client/patches/patch-client_mysqladmin.cc \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_build__configurations_compiler__options.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_build__configurations_mysql__release.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_ldap.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-include_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-include_my__compare.h \
    pkgsrc/databases/mysql57-client/patches/patch-include_my__global.h \
    pkgsrc/databases/mysql57-client/patches/patch-include_my__thread.h \
    pkgsrc/databases/mysql57-client/patches/patch-include_my__thread__os__id.h \
    pkgsrc/databases/mysql57-client/patches/patch-mysys_mf__iocache2.c \
    pkgsrc/databases/mysql57-client/patches/patch-mysys_my__symlink.c \
    pkgsrc/databases/mysql57-client/patches/patch-mysys_stacktrace.c \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c \
    pkgsrc/databases/mysql57-client/patches/patch-scripts_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-scripts_mysqld_safe.sh \
    pkgsrc/databases/mysql57-client/patches/patch-sql_item__geofunc__internal.cc \
    pkgsrc/databases/mysql57-client/patches/patch-sql_log_event.h \
    pkgsrc/databases/mysql57-client/patches/patch-sql_sys__vars.cc \
    pkgsrc/databases/mysql57-client/patches/patch-storage_archive_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_blackhole_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_csv_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_example_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_federated_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_heap_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_myisam_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-storage_myisammrg_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-strings_decimal.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_readline.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-mysql-test_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-mysys_kqueue__timers.c \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_rpcgen.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc \
    pkgsrc/databases/mysql57-client/patches/patch-sql_locks_shared__spin__lock.cc
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql57-server/DEINSTALL \
    pkgsrc/databases/mysql57-server/DESCR \
    pkgsrc/databases/mysql57-server/MESSAGE.sphinx \
    pkgsrc/databases/mysql57-server/PLIST.SunOS
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql57-server/MESSAGE
cvs rdiff -u -r1.52 -r0 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.29 -r0 pkgsrc/databases/mysql57-server/PLIST
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql57-server/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mysql57-server/files/mysqld.sh
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql57-server/files/smf/manifest.xml \
    pkgsrc/databases/mysql57-server/files/smf/mysqld.sh
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/sqlite3/builtin.mk
cvs rdiff -u -r1.4858 -r1.4859 pkgsrc/doc/CHANGES-2024
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mk/mysql.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/Makefile
diff -u pkgsrc/databases/Makefile:1.715 pkgsrc/databases/Makefile:1.716
--- pkgsrc/databases/Makefile:1.715     Mon Aug  5 01:26:18 2024
+++ pkgsrc/databases/Makefile   Mon Aug  5 06:30:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.715 2024/08/05 01:26:18 jnemeth Exp $
+# $NetBSD: Makefile,v 1.716 2024/08/05 06:30:26 wiz Exp $
 
 COMMENT=       Databases
 
@@ -116,10 +116,6 @@ SUBDIR+=   mongodb3
 SUBDIR+=       mongodb4
 SUBDIR+=       myodbc
 SUBDIR+=       mysql-connector-c++
-SUBDIR+=       mysql56-client
-SUBDIR+=       mysql56-server
-SUBDIR+=       mysql57-client
-SUBDIR+=       mysql57-server
 SUBDIR+=       mysql75-cluster
 SUBDIR+=       mysql80-client
 SUBDIR+=       mysql80-cluster

Index: pkgsrc/doc/CHANGES-2024
diff -u pkgsrc/doc/CHANGES-2024:1.4858 pkgsrc/doc/CHANGES-2024:1.4859
--- pkgsrc/doc/CHANGES-2024:1.4858      Mon Aug  5 05:42:37 2024
+++ pkgsrc/doc/CHANGES-2024     Mon Aug  5 06:30:26 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2024,v 1.4858 2024/08/05 05:42:37 adam Exp $
+$NetBSD: CHANGES-2024,v 1.4859 2024/08/05 06:30:26 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2024:
 
@@ -7598,3 +7598,7 @@ Changes to the packages collection and i
        Updated devel/py-wheel to 0.44.0 [adam 2024-08-05]
        Updated devel/py-setuptools-rust to 1.10.1 [adam 2024-08-05]
        Updated www/py-aiohttp to 3.10.1 [adam 2024-08-05]
+       Removed databases/mysql56-client [wiz 2024-08-05]
+       Removed databases/mysql56-server [wiz 2024-08-05]
+       Removed databases/mysql57-client [wiz 2024-08-05]
+       Removed databases/mysql57-server [wiz 2024-08-05]

Index: pkgsrc/mk/mysql.buildlink3.mk
diff -u pkgsrc/mk/mysql.buildlink3.mk:1.41 pkgsrc/mk/mysql.buildlink3.mk:1.42
--- pkgsrc/mk/mysql.buildlink3.mk:1.41  Tue Jan 23 14:59:32 2024
+++ pkgsrc/mk/mysql.buildlink3.mk       Mon Aug  5 06:30:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.41 2024/01/23 14:59:32 nia Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.42 2024/08/05 06:30:25 wiz Exp $
 #
 # This file is included by packages that require some version of the
 # MySQL database client.
@@ -8,7 +8,7 @@
 # MYSQL_VERSION_DEFAULT
 #      The preferred MySQL version.
 #
-#      Possible: 57 56 80 mariadb1011 mariadb106 mariadb105 mariadb104
+#      Possible: 80 mariadb1011 mariadb106 mariadb105 mariadb104
 #      Default: mariadb1011
 #
 # Package-settable variables:
@@ -40,18 +40,12 @@ _SYS_VARS.mysql=    MYSQL_VERSION MYSQL_VER
 #
 MARIADB_VERSIONS_ALL+=         mariadb1011 mariadb106 mariadb105 mariadb104
 
-MYSQL_VERSIONS_ALL=            80 57 56
+MYSQL_VERSIONS_ALL=            80
 MYSQL_VERSIONS_ALL+=           ${MARIADB_VERSIONS_ALL}
 
 MYSQL_PKGBASE.80=              mysql-client-8.0.*
 MYSQL_PKGSRCDIR.80=            ../../databases/mysql80-client
 
-MYSQL_PKGBASE.57=              mysql-client-5.7.*
-MYSQL_PKGSRCDIR.57=            ../../databases/mysql57-client
-
-MYSQL_PKGBASE.56=              mysql-client-5.6.*
-MYSQL_PKGSRCDIR.56=            ../../databases/mysql56-client
-
 MYSQL_PKGBASE.mariadb104=      mariadb-client-10.4.*
 MYSQL_PKGSRCDIR.mariadb104=    ../../databases/mariadb104-client
 
@@ -78,7 +72,7 @@ _SYS_VARS.mysql+=             MYSQL_PKGBASE.${ver} 
 # be chosen.
 #
 MYSQL_VERSION_DEFAULT?=                mariadb1011
-MYSQL_VERSIONS_ACCEPTED?=      57 56 80 mariadb1011 mariadb106 mariadb105 mariadb104
+MYSQL_VERSIONS_ACCEPTED?=      80 mariadb1011 mariadb106 mariadb105 mariadb104
 
 #
 # Previous versions of this file used shouty caps in the version names.  We