pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases mysql80: Update to 8.0.31.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2b1899a38b1
branches:  trunk
changeset: 387617:c2b1899a38b1
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Nov 02 17:02:10 2022 +0000

description:
mysql80: Update to 8.0.31.

Includes a number of pkgsrc cleanups, removing nonsense that has been
cargo-culted since the MySQL 3.23.x days(!).  Stop shipping mysql-test, it's
absolutely huge and unnecessary.  Add XXX to undocumented patches that we
should probably just drop, and make others easier to maintain.

Upstream changes are far too numerous to include here, so here are the links to
the corresponding release notes for each since 8.0.24:

  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-31.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-30.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-29.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-28.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-27.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-26.html
  https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-25.html

Tested on SmartOS, I'll monitor bulk build reports for any fallout on other
platforms (it takes ages to build).

diffstat:

 databases/mysql80-client/MESSAGE                                                                       |      5 -
 databases/mysql80-client/Makefile                                                                      |      3 +-
 databases/mysql80-client/Makefile.common                                                               |     62 +-
 databases/mysql80-client/PLIST                                                                         |      4 +-
 databases/mysql80-client/distinfo                                                                      |     36 +-
 databases/mysql80-client/options.mk                                                                    |     35 -
 databases/mysql80-client/patches/patch-CMakeLists.txt                                                  |      8 +-
 databases/mysql80-client/patches/patch-client_CMakeLists.txt                                           |     14 +-
 databases/mysql80-client/patches/patch-client_mysqladmin.cc                                            |     23 -
 databases/mysql80-client/patches/patch-cmake_boost.cmake                                               |     20 -
 databases/mysql80-client/patches/patch-cmake_ldap.cmake                                                |     15 +
 databases/mysql80-client/patches/patch-cmake_os_SunOS.cmake                                            |     26 +-
 databases/mysql80-client/patches/patch-include_my__compare.h                                           |      3 +-
 databases/mysql80-client/patches/patch-include_my__thread.h                                            |      4 +-
 databases/mysql80-client/patches/patch-libmysql_CMakeLists.txt                                         |     71 +-
 databases/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h    |      8 +-
 databases/mysql80-client/patches/patch-scripts_mysqld_safe.sh                                          |      8 +-
 databases/mysql80-client/patches/patch-sql_CMakeLists.txt                                              |     12 +-
 databases/mysql80-client/patches/patch-sql_conn__handler_socket__connection.cc                         |      4 +-
 databases/mysql80-client/patches/patch-sql_item_geofunc_relchecks_bgwrap.h                             |     15 -
 databases/mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc      |     62 +
 databases/mysql80-client/patches/patch-storage_innobase_include_detail_ut_large__page__alloc-solaris.h |     15 +
 databases/mysql80-client/patches/patch-vio_viosocket.cc                                                |      6 +-
 databases/mysql80-server/MESSAGE.sphinx                                                                |     14 -
 databases/mysql80-server/Makefile                                                                      |     14 +-
 databases/mysql80-server/PLIST                                                                         |  21164 +---------
 databases/mysql80-server/buildlink3.mk                                                                 |      4 +-
 27 files changed, 236 insertions(+), 21419 deletions(-)

diffs (truncated from 22128 to 300 lines):

diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/MESSAGE
--- a/databases/mysql80-client/MESSAGE  Wed Nov 02 13:08:50 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2021/05/13 15:25:20 jdolecek Exp $
-
-This package is EXPERIMENTAL for now, recommend to only use for testing.
-===========================================================================
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/Makefile
--- a/databases/mysql80-client/Makefile Wed Nov 02 13:08:50 2022 +0000
+++ b/databases/mysql80-client/Makefile Wed Nov 02 17:02:10 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/06/28 11:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/11/02 17:02:10 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   4
 COMMENT=       MySQL 8, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]* mariadb-client-[0-9]*
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/Makefile.common
--- a/databases/mysql80-client/Makefile.common  Wed Nov 02 13:08:50 2022 +0000
+++ b/databases/mysql80-client/Makefile.common  Wed Nov 02 17:02:10 2022 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2021/06/04 13:44:21 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.3 2022/11/02 17:02:10 jperkin Exp $
 #
 # used by databases/mysql80-client/Makefile
 # used by databases/mysql80-server/Makefile
 
-DISTNAME=      mysql-8.0.24
+DISTNAME=      mysql-8.0.31
 CATEGORIES=    databases
-MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-8.0/}
+MASTER_SITES=  https://cdn.mysql.com/Downloads/MySQL-8.0/
 DISTFILES=     mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
@@ -15,18 +15,14 @@
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql80-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql80-client/patches
 
-BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.11
-
 USE_CMAKE=             yes
-USE_LANGUAGES=         c c++ c++14 # 1.75+ boost requires c++14
+USE_LANGUAGES=         c c++14
 USE_TOOLS+=            bash bison gmake perl:run
 USE_GCC_RUNTIME=       yes
 USE_BUILTIN.libevent=  no
 
 .include "../../mk/bsd.prefs.mk"
 
-.include "options.mk"
-
 # MYSQL_USER           username of the database administrator
 # MYSQL_GROUP          group of the database administrator
 # MYSQL_DATADIR                home directory (location of the databases)
@@ -46,8 +42,6 @@
 
 CONFIG_SHELL=          ${TOOLS_PATH.bash}
 
-CFLAGS.IRIX+=          -DIRIX5
-
 BUILD_DEFS+=           VARBASE
 
 # paths
@@ -57,16 +51,18 @@
 CMAKE_ARGS+=           -DINSTALL_INFODIR="info"
 CMAKE_ARGS+=           -DINSTALL_MANDIR="${PKGMANDIR}"
 CMAKE_ARGS+=           -DINSTALL_MYSQLSHAREDIR="share/mysql"
-CMAKE_ARGS+=           -DINSTALL_MYSQLTESTDIR="share/mysql/test"
+CMAKE_ARGS+=           -DINSTALL_MYSQLTESTDIR=""
 CMAKE_ARGS+=           -DINSTALL_PLUGINDIR="lib/mysql/plugin"
 CMAKE_ARGS+=           -DINSTALL_SBINDIR="sbin"
+CMAKE_ARGS+=           -DINSTALL_SCRIPTDIR="bin"
+CMAKE_ARGS+=           -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench"
 CMAKE_ARGS+=           -DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
 CMAKE_ARGS+=           -DROUTER_INSTALL_LOGROTATEDIR="share/mysql"
-CMAKE_ARGS+=           -DMYSQL_DATADIR=${MYSQL_DATADIR}
 
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
 
-CMAKE_ARGS+=           -DWITH_BOOST="${WRKSRC}/boost"
+CMAKE_ARGS+=           -DLOCAL_BOOST_DIR="${WRKSRC}/boost"
 CMAKE_ARGS+=           -DWITH_ICU="system"
 CMAKE_ARGS+=           -DWITH_LIBEVENT="system"
 CMAKE_ARGS+=           -DWITH_LZ4="system"
@@ -74,11 +70,11 @@
 CMAKE_ARGS+=           -DWITH_SSL="system"
 CMAKE_ARGS+=           -DWITH_ZLIB="system"
 CMAKE_ARGS+=           -DWITH_ZSTD="system"
+
 CMAKE_ARGS+=           -DDEFAULT_CHARSET=${MYSQL_CHARSET}
 CMAKE_ARGS+=           -DDEFAULT_COLLATION=${MYSQL_COLLATION}
 CMAKE_ARGS+=           -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
 CMAKE_ARGS+=           -DWITH_UNIT_TESTS=OFF
-CMAKE_ARGS+=           -DFORCE_INSOURCE_BUILD=1
 
 # we need atomic builtins
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
@@ -86,32 +82,15 @@
 CFLAGS+=               -march=i586
 .endif
 
-CPPFLAGS+=             -Dunix
-CFLAGS+=               -DUSE_OLD_FUNCTIONS # 3.23.x compat
-#CFLAGS+=              -D__STDC_FORMAT_MACROS=1 # always defined too late
-
-.if ${OPSYS} != "Interix"
-CFLAGS+=               -fPIC -DPIC
-CXXFLAGS+=             -fPIC -DPIC
-.endif
-
 CMAKE_ARGS.SunOS+=     -DFORCE_UNSUPPORTED_COMPILER=YES
 
 # Force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.  Also
 # explicitly disable epoll support as it is Linux-specific.
-CMAKE_ARGS.SunOS+=     -DHAVE_SYS_EPOLL_H=NO
-CFLAGS.SunOS+=         -DHAVE_CURSES_H
-CXXFLAGS.SunOS+=       -DHAVE_CURSES_H
-
-.include "../../mk/pthread.buildlink3.mk"
+CMAKE_ARGS.SunOS+=     -DHAVE_EPOLL=NO
 
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
-CFLAGS+=               -DSIGNALS_DONT_BREAK_READ
-CXXFLAGS+=             -DSIGNALS_DONT_BREAK_READ
-.endif
-
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysqlrouter
 
 SUBST_CLASSES+=                scr
 SUBST_STAGE.scr=       pre-configure
@@ -122,22 +101,27 @@
 SUBST_SED.scr+=                -e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=     Fixing scripts.
 
-CMAKE_ARGS+=           -DWITH_EDITLINE="system"
-CMAKE_ARGS+=           -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
+.include "../../mk/readline.buildlink3.mk"
+
+.if ${READLINE_TYPE} == "readline"
+CMAKE_ARGS+=   -DWITH_READLINE="system"
+.else
+CMAKE_ARGS+=   -DWITH_EDITLINE="system"
+.endif
 
 .if ${OPSYS} == "NetBSD"
 CFLAGS.NetBSD+=                -DHAVE_ALLOCA_H
 CXXFLAGS.NetBSD+=      -DHAVE_ALLOCA_H
 # MySQL code depends on having <alloca.h>
 post-patch:
-       echo "#define alloca(sz) __builtin_alloca(sz)" > ${WRKSRC}/include/alloca.h
+       ${ECHO} "#define alloca(sz) __builtin_alloca(sz)" > ${WRKSRC}/include/alloca.h
 .endif
 
-.include "../../mk/curses.buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
-.include "../../devel/editline/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
+BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.11
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/PLIST
--- a/databases/mysql80-client/PLIST    Wed Nov 02 13:08:50 2022 +0000
+++ b/databases/mysql80-client/PLIST    Wed Nov 02 17:02:10 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/13 15:25:20 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/11/02 17:02:10 jperkin Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -29,7 +29,7 @@
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.21
-lib/libmysqlclient.so.21.1.24
+lib/libmysqlclient.so.21.2.31
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/ibd2sdi.1
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/distinfo
--- a/databases/mysql80-client/distinfo Wed Nov 02 13:08:50 2022 +0000
+++ b/databases/mysql80-client/distinfo Wed Nov 02 17:02:10 2022 +0000
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:09:25 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/11/02 17:02:10 jperkin Exp $
 
-BLAKE2s (mysql-boost-8.0.24.tar.gz) = 6734ea62a56d64e0241499919e11fae986deaf67239c8548a3adf529f4d97407
-SHA512 (mysql-boost-8.0.24.tar.gz) = ad8510614251c056f0963f8e51b9ed5e75452ccbf2728254d662fcc3a7ee1bdc177d1d34e958ddc31c7e6b5b3af9377ef2d9cbdc0353676b3026619673447deb
-Size (mysql-boost-8.0.24.tar.gz) = 290263082 bytes
-SHA1 (patch-CMakeLists.txt) = 16ca9bcbcaefdc8bd1bc0e8dc89ca7a347d14675
-SHA1 (patch-client_CMakeLists.txt) = f96d0d2e5ad8c1c8f5d6a9eabbd1c706bee852c0
-SHA1 (patch-client_mysqladmin.cc) = e3459bd009ef7ac0b7acece6bbcb82777a384db3
-SHA1 (patch-cmake_boost.cmake) = 7452d5ef84c63bb0bd34313aa0cedafee5f41618
-SHA1 (patch-cmake_os_SunOS.cmake) = 15cf67c136c2b6e608d9379290d235d71d6b769e
+BLAKE2s (mysql-boost-8.0.31.tar.gz) = 2da23b9233a2c5060aa22074cbe990d0dc1d90b2e55a4cd4b32571d2c77fe3bf
+SHA512 (mysql-boost-8.0.31.tar.gz) = 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
+Size (mysql-boost-8.0.31.tar.gz) = 334504577 bytes
+SHA1 (patch-CMakeLists.txt) = 6179dd8ff880e40ca5b309b5a63c55ac80875c15
+SHA1 (patch-client_CMakeLists.txt) = 4fbaf94d43b6c58aa14712213c08b897bd6227cf
+SHA1 (patch-cmake_ldap.cmake) = 46f0df1109ca0886e0d0903a39e25278139f1849
+SHA1 (patch-cmake_os_SunOS.cmake) = 66a7d4386f07c68ae85a94d467465e6d1bec6b57
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
 SHA1 (patch-config.h.cmake) = e6debea316c5bb8338afb693d704007d45b3941f
 SHA1 (patch-configure.cmake) = b03de49ecb8d6ce58ef24f5dcd8f0a8c95eab592
 SHA1 (patch-include_CMakeLists.txt) = 289c1454d1b7e7fe8566187b3cefc722260993b6
-SHA1 (patch-include_my__compare.h) = e6b3146252d1ebf2e2423ed3682621aa68cce6bd
-SHA1 (patch-include_my__thread.h) = 176134a238c5c2f983aadb6d1cd620165f4057bb
+SHA1 (patch-include_my__compare.h) = b66c8cebef8ab3328201fe4c7433a484ba83e203
+SHA1 (patch-include_my__thread.h) = a88fee119c9a9e2c89e54c8b59555b0d5100cbcc
 SHA1 (patch-include_my__thread__os__id.h) = 383923523623d0811915d5d75c523904102dcf43
 SHA1 (patch-include_tables__contained__in.h) = c332b10760ef8b7f16b1e94821b79589f525e4e7
-SHA1 (patch-libmysql_CMakeLists.txt) = c46b0091aaebe91da89b2a8fb70398965d417664
+SHA1 (patch-libmysql_CMakeLists.txt) = cbc2185e52194de1bcdfe5e2af7bfc857e747acd
 SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
 SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
 SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
-SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = 4daf0b2a9e92eb6ffe8a00eb0bfb37db7a8638ee
+SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = ade643148787438d6d6f1f7b2636bbd0af87d70f
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_internet.h) = 29e019236423aaa77b71b273d009404e4fbafe73
 SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_local.h) = d2149f9840dc8b65a4d9d8332bcd5088b4f9b919
 SHA1 (patch-router_src_harness_include_mysql_harness_tty.h) = ca883b2ed83b623922b58cf96f896de9847d37cb
 SHA1 (patch-router_src_harness_src_stdx_io_file_handle.cc) = 5349b05663179e4ef049cfb1532514e48a3885c9
 SHA1 (patch-scripts_CMakeLists.txt) = 15be14619275f0dc39c216901b2cabc6ee517300
-SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
-SHA1 (patch-sql_CMakeLists.txt) = 84af2f2e58a17bde292a665a726489b8f56f4132
-SHA1 (patch-sql_conn__handler_socket__connection.cc) = b414e0d499f51750e1aa6e9dd7b4e7006456a079
-SHA1 (patch-sql_item_geofunc_relchecks_bgwrap.h) = d20896bfe2391d30aa9e95834c77e7de03377d76
+SHA1 (patch-scripts_mysqld_safe.sh) = 3d10c84e6fef391b5e7cd9a3ed0223bd8b18c42e
+SHA1 (patch-sql_CMakeLists.txt) = 94809ea12966392b9ea317da42f2b84219d36cc0
+SHA1 (patch-sql_conn__handler_socket__connection.cc) = 91f2f707576618396579809b83f931e51385d2a2
 SHA1 (patch-sql_join__optimizer_bit__utils.h) = 3e75331da6b50935f082b2f738e6c6964afef5f7
 SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc) = e08ed53790ac8b03b38d566fee3a2688ca6065b3
-SHA1 (patch-vio_viosocket.cc) = 15dcc0dee88e736a844aacc02e9dbc6beeb915e4
+SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc) = 1ce0aec798a22f966c37d9ee38b3dee3d855a7e3
+SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-solaris.h) = 2b41381af66e22231e897ebc97346c13b1f1e3a7
+SHA1 (patch-vio_viosocket.cc) = fcbe1eccb58fb840857f22178291ed2fb2c870b0
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/options.mk
--- a/databases/mysql80-client/options.mk       Wed Nov 02 13:08:50 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2021/05/13 15:25:20 jdolecek Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql8
-
-# ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=        ndb-cluster
-PKG_SUPPORTED_OPTIONS+=        memcached
-
-.include "../../mk/bsd.options.mk"
-
-# Enable InnoDB Memcached support
-PLIST_VARS+=           memcached
-.if !empty(PKG_OPTIONS:Mmemcached)
-PLIST.memcached=       yes
-CMAKE_ARGS+=           -DWITH_INNODB_MEMCACHED=ON
-CMAKE_ARGS+=           -DWITH_BUNDLED_MEMCACHED=ON
-.else
-CMAKE_ARGS+=           -DWITH_INNODB_MEMCACHED=OFF
-.endif
-
-# Enable Sphinx SE support
-# http://sphinxsearch.com/docs/current.html#sphinxse-overview
-#PLIST_VARS+=  sphinx
-#.if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-#SPHINX_VER=   2.2.11
-#DISTFILES=    ${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-#SITES.sphinx-2.2.11-release.tar.gz=   http://sphinxsearch.com/files/
-#.  if !empty(PKGPATH:Mdatabases/mysql56-server)
-#MESSAGE_SRC=  ${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
-#.  endif
-#PLIST.sphinx= yes
-
-#post-extract:
-#      ${CP} -R ${WRKDIR}/sphinx-${SPHINX_VER}-release/mysqlse ${WRKSRC}/storage/sphinx
-#.endif
diff -r dbf72bdcd510 -r c2b1899a38b1 databases/mysql80-client/patches/patch-CMakeLists.txt
--- a/databases/mysql80-client/patches/patch-CMakeLists.txt     Wed Nov 02 13:08:50 2022 +0000
+++ b/databases/mysql80-client/patches/patch-CMakeLists.txt     Wed Nov 02 17:02:10 2022 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/13 15:25:20 jdolecek Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2022/11/02 17:02:10 jperkin Exp $
 
 Split configuration between mysql-client and mysql-server.
 
---- CMakeLists.txt.orig        2019-12-09 19:53:17.000000000 +0000
+--- CMakeLists.txt.orig        2022-09-13 16:15:16.000000000 +0000
 +++ CMakeLists.txt
-@@ -1329,8 +1329,9 @@ ADD_SUBDIRECTORY(utilities)
+@@ -2192,8 +2192,9 @@ ADD_SUBDIRECTORY(utilities)



Home | Main Index | Thread Index | Old Index