head 1.22; access; symbols pkgsrc-2024Q2:1.21.0.2 pkgsrc-2024Q2-base:1.21 pkgsrc-2024Q1:1.18.0.6 pkgsrc-2024Q1-base:1.18 pkgsrc-2023Q4:1.18.0.4 pkgsrc-2023Q4-base:1.18 pkgsrc-2023Q3:1.18.0.2 pkgsrc-2023Q3-base:1.18 pkgsrc-2023Q2:1.15.0.10 pkgsrc-2023Q2-base:1.15 pkgsrc-2023Q1:1.15.0.8 pkgsrc-2023Q1-base:1.15 pkgsrc-2022Q4:1.15.0.6 pkgsrc-2022Q4-base:1.15 pkgsrc-2022Q3:1.15.0.4 pkgsrc-2022Q3-base:1.15 pkgsrc-2022Q2:1.15.0.2 pkgsrc-2022Q2-base:1.15 pkgsrc-2022Q1:1.14.0.6 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.4 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.2 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.8.0.2 pkgsrc-2021Q2-base:1.8; locks; strict; comment @# @; 1.22 date 2024.08.17.00.59.45; author nia; state dead; branches; next 1.21; commitid gZdZOc3I7Xs807mF; 1.21 date 2024.05.15.19.21.43; author jperkin; state Exp; branches; next 1.20; commitid yxYgJVKFs7t878aF; 1.20 date 2024.05.06.08.41.57; author jperkin; state Exp; branches; next 1.19; commitid fJ9bsHfEPKdPRU8F; 1.19 date 2024.05.06.08.27.50; author jperkin; state Exp; branches; next 1.18; commitid YcrhyZVPKZ0TMU8F; 1.18 date 2023.08.17.08.20.27; author jperkin; state Exp; branches; next 1.17; commitid GlJKmvU5R5FUb7BE; 1.17 date 2023.07.23.09.29.51; author nia; state Exp; branches; next 1.16; commitid 5NAPRkh4JKfkoUxE; 1.16 date 2023.07.19.21.53.19; author nia; state Exp; branches; next 1.15; commitid rssFrNFV0ackDsxE; 1.15 date 2022.04.23.22.52.46; author tnn; state Exp; branches; next 1.14; commitid zHXpSyLK8vLsunBD; 1.14 date 2021.09.01.06.21.46; author nia; state Exp; branches; next 1.13; commitid PTKJIes3FN6Owd7D; 1.13 date 2021.08.05.11.21.23; author nia; state Exp; branches; next 1.12; commitid 50M45JllgWUv3M3D; 1.12 date 2021.08.05.11.19.40; author nia; state Exp; branches; next 1.11; commitid eNILSO2RgTzR2M3D; 1.11 date 2021.07.24.11.49.44; author nia; state Exp; branches; next 1.10; commitid Vokjqf1tuPi5Be2D; 1.10 date 2021.07.13.07.44.14; author nia; state Exp; branches; next 1.9; commitid xgDxwOSgvlJPAN0D; 1.9 date 2021.07.04.10.58.59; author nia; state Exp; branches; next 1.8; commitid 2UQUBr16873AXEZC; 1.8 date 2021.05.30.16.33.29; author nia; state Exp; branches; next 1.7; commitid zObmwvp5mGw7WbVC; 1.7 date 2021.05.25.11.18.25; author jperkin; state Exp; branches; next 1.6; commitid Vho1RPQeBsATlwUC; 1.6 date 2021.05.25.11.14.54; author jperkin; state Exp; branches; next 1.5; commitid WbJk5bg8E2YzkwUC; 1.5 date 2021.05.25.11.06.41; author jperkin; state Exp; branches; next 1.4; commitid fIIMy9b25eMUhwUC; 1.4 date 2021.05.10.15.50.05; author nia; state Exp; branches; next 1.3; commitid jPQuN6jsVoN6lCSC; 1.3 date 2021.05.10.14.15.55; author nia; state Exp; branches; next 1.2; commitid 1xNTXL028qZHOBSC; 1.2 date 2021.05.08.19.57.39; author jdolecek; state Exp; branches; next 1.1; commitid GErhCRCvBRAZLnSC; 1.1 date 2021.05.08.19.47.16; author jdolecek; state Exp; branches; next ; commitid DJ5hrjtoEHQ1InSC; desc @@ 1.22 log @databases: Remove mariadb104 @ text @# $NetBSD: Makefile.common,v 1.21 2024/05/15 19:21:43 jperkin Exp $ # # used by databases/mariadb104-client/Makefile # used by databases/mariadb104-server/Makefile DISTNAME= mariadb-10.4.20 CATEGORIES= databases MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ MAINTAINER?= pkgsrc-users@@NetBSD.org HOMEPAGE= https://mariadb.org/ LICENSE= gnu-gpl-v2 DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb104-client/distinfo PATCHDIR?= ${.CURDIR}/../../databases/mariadb104-client/patches USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= perl:run pkg-config bison USE_CURSES= wide PLIST_SRC= ${PLIST_SRC_DFLT} .include "../../mk/bsd.prefs.mk" # # Use MySQL defaults if set. # MARIADB_DATADIR?= ${MYSQL_DATADIR:U${VARBASE}/db/mariadb} MARIADB_CHARSET?= ${MYSQL_CHARSET:Uutf8mb4} MARIADB_COLLATION?= ${MYSQL_COLLATION:Uutf8mb4_unicode_ci} MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET:Uall} BUILD_DEFS+= VARBASE CMAKE_ARGS+= -DCOMPILATION_COMMENT="pkgsrc" CMAKE_ARGS+= -DCMAKE_BUILD_TYPE="Release" CMAKE_ARGS+= -DINSTALL_BINDIR="bin" CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" CMAKE_ARGS+= -DINSTALL_INFODIR="${PKGINFODIR}" CMAKE_ARGS+= -DINSTALL_LIBDIR="lib" CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" 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+= -DINSTALL_SYSCONFDIR="${PKG_SYSCONFDIR}" CMAKE_ARGS+= -DMYSQL_DATADIR=${MARIADB_DATADIR} .if ${OPSYS} == "SunOS" CMAKE_ARGS+= -DWITH_MARIABACKUP=OFF .endif CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF CMAKE_ARGS+= -DWITH_LIBWRAP=ON CMAKE_ARGS+= -DWITH_ZLIB="system" CMAKE_ARGS+= -DDEFAULT_CHARSET=${MARIADB_CHARSET} CMAKE_ARGS+= -DDEFAULT_COLLATION=${MARIADB_COLLATION:Q} CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MARIADB_EXTRA_CHARSET:Q} CMAKE_ARGS+= -DPLUGIN_EXAMPLE=NO CMAKE_ARGS+= -DPLUGIN_FEEDBACK=NO # Requires Java CMAKE_ARGS+= -DCONNECT_WITH_JDBC=OFF # Options which affect generation of includes CMAKE_ARGS+= -DWITH_ARIA_STORAGE_ENGINE=ON CMAKE_ARGS+= -DWITH_PARTITION_STORAGE_ENGINE=ON CMAKE_ARGS+= -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=ON CMAKE_ARGS+= -DENABLE_DTRACE=OFF CMAKE_ARGS+= -DTOKUDB_OK=OFF # Ensure the correct DTrace ABI is used. .if !empty(ABI) CMAKE_ARGS+= -DDTRACE_FLAGS="-${ABI}" .endif CFLAGS.SunOS+= -fPIC REPLACE_PERL+= scripts/mytop.sh REPLACE_PERL+= sql-bench/*.sh SUBST_CLASSES+= perl SUBST_STAGE.perl= pre-configure SUBST_FILES.perl= scripts/CMakeLists.txt SUBST_SED.perl= -e "s,/usr/bin/perl,${TOOLS_PATH.perl},g" SUBST_SED.perl+= -e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g" CHECK_INTERPRETER_SKIP+= share/mysql/test/* CHECK_PORTABILITY_SKIP+= BUILD/compile-pentium-gcov PKGCONFIG_OVERRIDE+= support-files/mariadb.pc.in PKGCONFIG_OVERRIDE+= libmariadb/mariadb_config/libmariadb.pc.in .include "../../mk/curses.buildlink3.mk" # cmake probes for curses.h but then never passes on HAVE_CURSES_H if it is # found, which breaks the logic in client/mysql.cc .if ${CURSES_TYPE} == "ncurses" CPPFLAGS+= -DHAVE_CURSES_H .endif .include "../../devel/zlib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/atomic64.mk" .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} .include "../../mk/pam.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" .include "../../mk/krb5.buildlink3.mk" @ 1.21 log @mariadb*: Restore part of curses handling. Add a comment to explain why this specifically is required. It was the other lines that were causing breakage. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.20 2024/05/06 08:41:57 jperkin Exp $ @ 1.20 log @mariadb*: Remove ncurses workarounds. It's unclear what they were required for previously, but with the new ncurses package they are now actively harmful, and removing them fixes the build. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.19 2024/05/06 08:27:50 jperkin Exp $ d107 8 a117 1 .include "../../mk/curses.buildlink3.mk" @ 1.19 log @*: Switch packages to combined ncurses package. CURSES_TYPE=ncursesw is no longer valid, update matches to use ncurses. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.18 2023/08/17 08:20:27 jperkin Exp $ a89 8 .include "../../mk/curses.buildlink3.mk" .if !empty(CURSES_TYPE:M*ncurses*) CMAKE_ARGS+= -DCURSES_NEED_NCURSES=ON CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON CPPFLAGS+= -DHAVE_CURSES_H .endif d110 1 @ 1.18 log @mariadb*-client: Force HAVE_CURSES_H when using ncurses. For some reason mariadb removed any cmake detection for HAVE_CURSES_H so it is never defined, but the source is still littered with it, causing compilation problems because curses.h never gets included. The whole thing is incredibly messy, and this is the least likely to accidentally break some alternate configuration, but implementations that use curses.h which isn't ncurses are likely to still be broken. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.17 2023/07/23 09:29:51 nia Exp $ d94 1 a97 4 .if !empty(CURSES_TYPE:M*ncursesw*) CMAKE_ARGS+= -DCURSES_NEED_WIDE=ON .endif @ 1.17 log @mariadb: Correct include order for broken curses detection workarounds. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.16 2023/07/19 21:53:19 nia Exp $ d94 1 @ 1.16 log @mariadb*-client: Ensure the wide ncurses library is picked if the user chose it @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.15 2022/04/23 22:52:46 tnn Exp $ d90 6 a119 1 .include "../../mk/curses.buildlink3.mk" @ 1.15 log @mariadb104-client: only use the archive master site @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.14 2021/09/01 06:21:46 nia Exp $ d90 4 @ 1.14 log @mariadb*: Wants 64-bit atomic operations on i386. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.13 2021/08/05 11:21:23 nia Exp $ d8 1 a8 2 MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ @ 1.13 log @mariadb*: Include buildlink3 file for PAM @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.12 2021/08/05 11:19:40 nia Exp $ d110 1 @ 1.12 log @mariadb*: per bulk builds and OmniOS, disable mariabackup on SunOS @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.11 2021/07/24 11:49:44 nia Exp $ d113 1 @ 1.11 log @mariadb104: Update to 10.4.20 This version of MariaDB is being released now to fix the following two regressions: Table alias from previous statement interferes later commands (MDEV-25672) Join using derived with aggregation returns incorrect results (MDEV-25714) @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.10 2021/07/13 07:44:14 nia Exp $ d58 4 @ 1.10 log @mariadb*: see if wide curses fixes problems on el7... @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.9 2021/07/04 10:58:59 nia Exp $ d6 1 a6 1 DISTNAME= mariadb-10.4.18 @ 1.9 log @mariadb104: Disable installing tests. Suggested by jperkin. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.8 2021/05/30 16:33:29 nia Exp $ d21 1 @ 1.8 log @mariadb*: cmake does not CPPFLAGS @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.7 2021/05/25 11:18:25 jperkin Exp $ d48 1 a48 1 CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" @ 1.7 log @mariadb*: Remove MESSAGE files of questionable value. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.6 2021/05/25 11:14:54 jperkin Exp $ d86 1 a86 3 CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE CPPFLAGS.SunOS+= -fPIC d108 1 @ 1.6 log @mariadb*: Simplify variable assignment and dedup. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.5 2021/05/25 11:06:41 jperkin Exp $ a16 1 MESSAGE_SRC+= ${.CURDIR}/../../databases/mariadb104-client/MESSAGE @ 1.5 log @mariadb*-client: Requires krb5. @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.4 2021/05/10 15:50:05 nia Exp $ d27 7 a33 26 # home directory (location of the databases) .if !empty(MYSQL_DATADIR) MARIADB_DATADIR?= ${MYSQL_DATADIR} .else MARIADB_DATADIR?= ${VARBASE}/db/mariadb .endif # default character set .if !empty(MYSQL_CHARSET) MARIADB_CHARSET?= ${MYSQL_CHARSET} .else MARIADB_CHARSET?= utf8mb4 .endif # additional character set to be compiled in .if !empty(MYSQL_COLLATION) MARIADB_COLLATION?= ${MYSQL_COLLATION} .else MARIADB_COLLATION?= utf8mb4_unicode_ci .endif .if !empty(MYSQL_EXTRA_CHARSET) MARIADB_EXTRA_CHARSET?= ${MYSQL_EXTRA_CHARSET} .else MARIADB_EXTRA_CHARSET?= all .endif @ 1.4 log @mariadb104: remove duplicated WITH_SSL @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.3 2021/05/10 14:15:55 nia Exp $ d130 1 @ 1.3 log @mariadb104: Split options.mk for both packages, pointed out by wiz While here try to strip down the build a bit... @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.2 2021/05/08 19:57:39 jdolecek Exp $ a78 1 CMAKE_ARGS+= -DWITH_SSL="system" @ 1.2 log @update wip reference in comment @ text @d1 1 a1 1 # $NetBSD: Makefile.common,v 1.1 2021/05/08 19:47:16 jdolecek Exp $ d56 4 d77 1 d79 1 d85 6 a125 2 .include "options.mk" .include "../../devel/readline/buildlink3.mk" @ 1.1 log @Add client and server packages for MariaDB 10.4 Copy of the pkgsrc-wip packages by nia@@. Consider experimental for now. @ text @d1 1 a1 1 # $NetBSD$ d3 2 a4 2 # used by wip/mariadb104-client/Makefile # used by wip/mariadb104-server/Makefile @