Received: by mail.netbsd.org (Postfix, from userid 605) id 30F4F84DB6; Thu, 13 May 2021 11:04:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6C53F84DA9 for ; Thu, 13 May 2021 11:04:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ED5kicWUPH8J for ; Thu, 13 May 2021 11:04:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5CD7384CE1 for ; Thu, 13 May 2021 11:04:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5034BFA95; Thu, 13 May 2021 11:04:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620903884149990" MIME-Version: 1.0 Date: Thu, 13 May 2021 11:04:44 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210513110444.5034BFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620903884149990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu May 13 11:04:44 UTC 2021 Modified Files: pkgsrc/databases: Makefile pkgsrc/mk: mysql.buildlink3.mk pkgsrc/www/php-piwigo: MESSAGE Removed Files: pkgsrc/databases/mariadb55-client: DESCR MESSAGE Makefile Makefile.common PLIST buildlink3.mk distinfo options.mk pkgsrc/databases/mariadb55-client/patches: patch-BUILD_compile-pentium-gcov patch-CMakeLists.txt patch-client_completion_hash.cc patch-client_mysql.cc patch-client_mysqladmin.cc patch-client_mysqlbinlog.cc patch-client_mysqlshow.c patch-cmake_dtrace.cmake patch-cmake_libutils.cmake patch-cmake_plugin.cmake patch-cmake_readline.cmake patch-config.h.cmake patch-include_CMakeLists.txt patch-include_my__context.h patch-include_my_compare.h patch-include_my_net.h patch-include_my_pthread.h patch-include_myisam.h patch-include_violite.h patch-libmysql_CMakeLists.txt patch-mysys_my__getopt.c patch-mysys_my_symlink.c patch-mysys_stacktrace.c patch-plugin_handler__socket_libhsclient_socket.cpp patch-scripts_CMakeLists.txt patch-scripts_mysqld_safe.sh patch-sql-common_client__plugin.c patch-sql_CMakeLists.txt patch-sql_log_event.h patch-sql_mysqld.cc patch-sql_sql_string.h 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_include_os0sync.h patch-storage_myisam_CMakeLists.txt patch-storage_myisammrg_CMakeLists.txt patch-storage_ndb_include_util_Parser.hpp patch-storage_tokudb_ft-index_portability_portability.cc patch-storage_tokudb_ft-index_portability_toku__portability.h patch-storage_tokudb_ft-index_portability_toku__pthread.cc patch-storage_tokudb_ft-index_portability_toku__pthread.h patch-storage_tokudb_ft-index_src_ydb-internal.h patch-strings_decimal.c patch-strtoll.c patch-strtoull.c patch-vio_viosocket.c pkgsrc/databases/mariadb55-server: DEINSTALL DESCR MESSAGE MESSAGE.sphinx Makefile PLIST PLIST.SunOS buildlink3.mk pkgsrc/databases/mariadb55-server/files: mysqld.sh pkgsrc/databases/mariadb55-server/files/smf: manifest.xml mysqld.sh Log Message: Remove mariadb55, EOL since April 2020. To generate a diff of this commit: cvs rdiff -u -r1.628 -r1.629 pkgsrc/databases/Makefile cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mariadb55-client/DESCR \ pkgsrc/databases/mariadb55-client/MESSAGE cvs rdiff -u -r1.14 -r0 pkgsrc/databases/mariadb55-client/Makefile cvs rdiff -u -r1.8 -r0 pkgsrc/databases/mariadb55-client/Makefile.common cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mariadb55-client/PLIST cvs rdiff -u -r1.7 -r0 pkgsrc/databases/mariadb55-client/buildlink3.mk cvs rdiff -u -r1.10 -r0 pkgsrc/databases/mariadb55-client/distinfo cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mariadb55-client/options.mk cvs rdiff -u -r1.1 -r0 \ pkgsrc/databases/mariadb55-client/patches/patch-BUILD_compile-pentium-gcov \ pkgsrc/databases/mariadb55-client/patches/patch-client_completion_hash.cc \ pkgsrc/databases/mariadb55-client/patches/patch-client_mysqladmin.cc \ pkgsrc/databases/mariadb55-client/patches/patch-client_mysqlbinlog.cc \ pkgsrc/databases/mariadb55-client/patches/patch-client_mysqlshow.c \ pkgsrc/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake \ pkgsrc/databases/mariadb55-client/patches/patch-cmake_libutils.cmake \ pkgsrc/databases/mariadb55-client/patches/patch-cmake_plugin.cmake \ pkgsrc/databases/mariadb55-client/patches/patch-config.h.cmake \ pkgsrc/databases/mariadb55-client/patches/patch-include_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-include_my_compare.h \ pkgsrc/databases/mariadb55-client/patches/patch-include_my_net.h \ pkgsrc/databases/mariadb55-client/patches/patch-include_my_pthread.h \ pkgsrc/databases/mariadb55-client/patches/patch-include_myisam.h \ pkgsrc/databases/mariadb55-client/patches/patch-libmysql_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-mysys_my__getopt.c \ pkgsrc/databases/mariadb55-client/patches/patch-mysys_my_symlink.c \ pkgsrc/databases/mariadb55-client/patches/patch-mysys_stacktrace.c \ pkgsrc/databases/mariadb55-client/patches/patch-plugin_handler__socket_libhsclient_socket.cpp \ pkgsrc/databases/mariadb55-client/patches/patch-scripts_mysqld_safe.sh \ pkgsrc/databases/mariadb55-client/patches/patch-sql-common_client__plugin.c \ pkgsrc/databases/mariadb55-client/patches/patch-sql_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-sql_log_event.h \ pkgsrc/databases/mariadb55-client/patches/patch-sql_mysqld.cc \ pkgsrc/databases/mariadb55-client/patches/patch-sql_sql_string.h \ pkgsrc/databases/mariadb55-client/patches/patch-storage_federated_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_heap_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_innobase_include_os0sync.h \ pkgsrc/databases/mariadb55-client/patches/patch-storage_myisam_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_myisammrg_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_ndb_include_util_Parser.hpp \ pkgsrc/databases/mariadb55-client/patches/patch-storage_tokudb_ft-index_portability_portability.cc \ pkgsrc/databases/mariadb55-client/patches/patch-storage_tokudb_ft-index_portability_toku__portability.h \ pkgsrc/databases/mariadb55-client/patches/patch-storage_tokudb_ft-index_portability_toku__pthread.cc \ pkgsrc/databases/mariadb55-client/patches/patch-storage_tokudb_ft-index_portability_toku__pthread.h \ pkgsrc/databases/mariadb55-client/patches/patch-storage_tokudb_ft-index_src_ydb-internal.h \ pkgsrc/databases/mariadb55-client/patches/patch-strings_decimal.c \ pkgsrc/databases/mariadb55-client/patches/patch-strtoll.c \ pkgsrc/databases/mariadb55-client/patches/patch-strtoull.c \ pkgsrc/databases/mariadb55-client/patches/patch-vio_viosocket.c cvs rdiff -u -r1.2 -r0 \ pkgsrc/databases/mariadb55-client/patches/patch-CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-include_my__context.h \ pkgsrc/databases/mariadb55-client/patches/patch-include_violite.h \ pkgsrc/databases/mariadb55-client/patches/patch-scripts_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_archive_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_blackhole_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_csv_CMakeLists.txt \ pkgsrc/databases/mariadb55-client/patches/patch-storage_example_CMakeLists.txt cvs rdiff -u -r1.3 -r0 \ pkgsrc/databases/mariadb55-client/patches/patch-client_mysql.cc \ pkgsrc/databases/mariadb55-client/patches/patch-cmake_readline.cmake cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mariadb55-server/DEINSTALL \ pkgsrc/databases/mariadb55-server/MESSAGE.sphinx cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mariadb55-server/DESCR \ pkgsrc/databases/mariadb55-server/MESSAGE cvs rdiff -u -r1.14 -r0 pkgsrc/databases/mariadb55-server/Makefile cvs rdiff -u -r1.7 -r0 pkgsrc/databases/mariadb55-server/PLIST cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mariadb55-server/PLIST.SunOS cvs rdiff -u -r1.5 -r0 pkgsrc/databases/mariadb55-server/buildlink3.mk cvs rdiff -u -r1.2 -r0 pkgsrc/databases/mariadb55-server/files/mysqld.sh cvs rdiff -u -r1.4 -r0 \ pkgsrc/databases/mariadb55-server/files/smf/manifest.xml cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mariadb55-server/files/smf/mysqld.sh cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/mysql.buildlink3.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-piwigo/MESSAGE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620903884149990 Content-Disposition: inline Content-Length: 3556 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/Makefile diff -u pkgsrc/databases/Makefile:1.628 pkgsrc/databases/Makefile:1.629 --- pkgsrc/databases/Makefile:1.628 Sat May 8 19:47:15 2021 +++ pkgsrc/databases/Makefile Thu May 13 11:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.628 2021/05/08 19:47:15 jdolecek Exp $ +# $NetBSD: Makefile,v 1.629 2021/05/13 11:04:43 nia Exp $ COMMENT= Databases @@ -100,8 +100,6 @@ SUBDIR+= lua-tokyocabinet SUBDIR+= mariadb-connector-c SUBDIR+= mariadb104-client SUBDIR+= mariadb104-server -SUBDIR+= mariadb55-client -SUBDIR+= mariadb55-server SUBDIR+= metakit-lib SUBDIR+= mongo-c-driver SUBDIR+= mongo-tools Index: pkgsrc/mk/mysql.buildlink3.mk diff -u pkgsrc/mk/mysql.buildlink3.mk:1.30 pkgsrc/mk/mysql.buildlink3.mk:1.31 --- pkgsrc/mk/mysql.buildlink3.mk:1.30 Sat May 8 19:53:28 2021 +++ pkgsrc/mk/mysql.buildlink3.mk Thu May 13 11:04:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mysql.buildlink3.mk,v 1.30 2021/05/08 19:53:28 jdolecek Exp $ +# $NetBSD: mysql.buildlink3.mk,v 1.31 2021/05/13 11:04:43 nia 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 MARIADB55 MARIADB104 +# Possible: 57 56 MARIADB104 # Default: 57 # # Package-settable variables: @@ -37,7 +37,7 @@ _SYS_VARS.mysql= MYSQL_PKGSRCDIR .include "../../mk/bsd.prefs.mk" MYSQL_VERSION_DEFAULT?= 57 -MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB55 MARIADB104 +MYSQL_VERSIONS_ACCEPTED?= 57 56 MARIADB104 # transform the list into individual variables .for mv in ${MYSQL_VERSIONS_ACCEPTED} @@ -56,16 +56,10 @@ _MYSQL_SO_56= so.18 .if exists(${LOCALBASE}/lib/libmysqlclient.${_MYSQL_SO_57}) _MYSQL_VERSION_57_INSTALLED= yes _MYSQL_VERSION_INSTALLED= 57 -.endif -.if exists(${LOCALBASE}/lib/libmysqlclient.${_MYSQL_SO_56}) -. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h) +.elif exists(${LOCALBASE}/lib/libmysqlclient.${_MYSQL_SO_56}) _MYSQL_VERSION_56_INSTALLED= yes _MYSQL_VERSION_INSTALLED= 56 -. elif exists(${LOCALBASE}/share/mariadb) -_MYSQL_VERSION_MARIADB55_INSTALLED= yes -_MYSQL_VERSION_INSTALLED= MARIADB55 -. endif -.elif exists(${LOCALBASE}/include/mysql/mariadb_version.h) +.elif exists(${LOCALBASE}/lib/libmariadb.so.3) _MYSQL_VERSION_MARIADB104_INSTALLED= yes _MYSQL_VERSION_INSTALLED= MARIADB104 .endif @@ -112,8 +106,6 @@ _MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTAC MYSQL_PKGSRCDIR= ../../databases/mysql57-client .elif ${_MYSQL_VERSION} == "56" MYSQL_PKGSRCDIR= ../../databases/mysql56-client -.elif ${_MYSQL_VERSION} == "MARIADB55" -MYSQL_PKGSRCDIR= ../../databases/mariadb55-client .elif ${_MYSQL_VERSION} == "MARIADB104" MYSQL_PKGSRCDIR= ../../databases/mariadb104-client .else Index: pkgsrc/www/php-piwigo/MESSAGE diff -u pkgsrc/www/php-piwigo/MESSAGE:1.4 pkgsrc/www/php-piwigo/MESSAGE:1.5 --- pkgsrc/www/php-piwigo/MESSAGE:1.4 Tue Jul 25 08:37:20 2017 +++ pkgsrc/www/php-piwigo/MESSAGE Thu May 13 11:04:43 2021 @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2017/07/25 08:37:20 manu Exp $ +$NetBSD: MESSAGE,v 1.5 2021/05/13 11:04:43 nia Exp $ To use Piwigo with Apache 2.4, you will need to perform the following steps. @@ -13,7 +13,7 @@ To use Piwigo with Apache 2.4, you will 2. Install MySQL or MariaDB database server - # cd databases/mariadb55-server + # cd databases/mysql57-server # make install 3. Start MySQL server, and setup MySQL server --_----------=_1620903884149990--