Merge branch 'joyent/feature/pbulkmulti/trunk' into joyent/release/trunk

databases/Makefile

@@ -113,6 +113,8 @@ SUBDIR+=	mysql56-client
 SUBDIR+=	mysql56-server
 SUBDIR+=	mysql57-client
 SUBDIR+=	mysql57-server
+SUBDIR+=	mysql80-client
+SUBDIR+=	mysql80-server
 SUBDIR+=	mysqltuner
 SUBDIR+=	mytop
 SUBDIR+=	nss-pgsql

databases/innotop/Makefile

@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	p5-Term-ReadKey>=2.10:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-DBI>=1.13:../../databases/p5-DBI
-DEPENDS+=	p5-DBD-mysql>=1.0:../../databases/p5-DBD-mysql
+DEPENDS+=	p5-DBD-{mysql,percona}*-[0-9]*:../../databases/p5-DBD-mysql
 
 PERL5_PACKLIST=	auto/innotop/.packlist
 REPLACE_PERL=	innotop

databases/myodbc/Makefile

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.43 2020/05/23 13:08:51 nia Exp $
 
 DISTNAME=	mysql-connector-odbc-5.3.2-src
-PKGNAME=	${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
+PKGNAME=	${DISTNAME:S/mysql-connector-odbc/${MYSQL_PKG_PREFIX}-odbc/:S/-src$//}
 PKGREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
@@ -14,16 +14,14 @@ LICENSE=	gnu-gpl-v2
 USE_CMAKE=		yes
 CMAKE_ARGS=		-Wno-dev
 #CMAKE_ARGS+=		-DMYSQL_DIR=${BUILDLINK_PREFIX.mysql-client}
-CMAKE_ARGS+=		-DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/include/mysql
+CMAKE_ARGS+=		-DMYSQL_INCLUDE_DIR=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client}
 USE_LANGUAGES=		c c++
 
 INSTALLATION_DIRS=	share/doc/mysql-connector-odbc
 INSTALLATION_DIRS+=	share/mysql-connector-odbc/test
 
 .include "options.mk"
 
-MYSQL_VERSIONS_ACCEPTED=	56
-
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"

databases/mysql80-client/DESCR

@@ -0,0 +1,14 @@
+MySQL is a SQL (Structured Query Language) database server. SQL is the most
+popular database language in the world. MySQL is a client-server implementation
+that consists of a server daemon `mysqld' and many different client
+programs/libraries.
+
+The main goals of MySQL are speed and robustness.
+
+The base upon which MySQL is built is a set of routines that have been used in
+a highly demanding production environment for many years.  While MySQL is still
+in development it already offers a rich and highly useful function set.
+
+The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
+
+This package contains the MySQL client programs and libraries.

databases/mysql80-client/Makefile

@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.20 2019/02/05 20:19:55 adam Exp $
+
+PKGNAME=	${DISTNAME:S/-/-client-/}
+COMMENT=	MySQL database client and libraries
+
+.include "Makefile.common"
+
+CMAKE_ARGS+=		-DWITHOUT_SERVER=ON
+UNWRAP_FILES+=		scripts/mysql_config
+INFO_FILES=		yes
+.for dir in client include libmysql man scripts testclients
+INSTALL_DIRS+=		${WRKDIR}/build/${dir}
+.endfor
+
+.include "../../mk/bsd.pkg.mk"

databases/mysql80-client/Makefile.common

@@ -0,0 +1,147 @@
+# $NetBSD: Makefile.common,v 1.15 2019/02/05 20:19:55 adam Exp $
+#
+# used by databases/mysql80-client/Makefile
+# used by databases/mysql80-server/Makefile
+
+DISTNAME=	mysql-8.0.16
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-8.0/}
+
+MAINTAINER?=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://www.mysql.com/
+LICENSE=	gnu-gpl-v2
+
+DISTINFO_FILE?=	${.CURDIR}/../../databases/mysql80-client/distinfo
+PATCHDIR?=	${.CURDIR}/../../databases/mysql80-client/patches
+
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++14
+USE_TOOLS+=		bash bison gmake perl:run
+
+.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)
+# MYSQL_PIDFILE		process ID file
+# MYSQL_CHARSET		default character set
+# MYSQL_EXTRA_CHARSET	additional character set to be compiled in
+MYSQL_USER?=		mysql
+MYSQL_GROUP?=		mysql
+MYSQL_DATADIR?=		${VARBASE}/mysql
+MYSQL_PIDFILE?=		${MYSQL_DATADIR}/${HOST}.pid
+#MYSQL_CHARSET?=		latin1
+#MYSQL_COLLATION?=	latin1_swedish_ci
+#MYSQL_EXTRA_CHARSET?=	all
+
+PKG_USERS_VARS+=	MYSQL_USER
+PKG_GROUPS_VARS+=	MYSQL_GROUP
+
+CONFIG_SHELL=		${TOOLS_PATH.bash}
+
+#CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
+
+BUILD_DEFS+=		VARBASE
+
+CONFIGURE_DIRS=		${WRKDIR}/build
+CMAKE_ARG_PATH=		${WRKSRC}
+
+post-extract:
+	${MKDIR} ${WRKDIR}/build
+
+# paths
+CMAKE_ARGS+=		-DINSTALL_DOCDIR="share/doc/mysql"
+CMAKE_ARGS+=		-DINSTALL_DOCREADMEDIR="share/doc/mysql"
+CMAKE_ARGS+=		-DINSTALL_INCLUDEDIR="include/mysql"
+CMAKE_ARGS+=		-DINSTALL_INFODIR="info"
+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+=		-DMYSQL_DATADIR=${MYSQL_DATADIR}
+
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+
+CMAKE_ARGS+=		-DWITH_BOOST="system"
+CMAKE_ARGS+=		-DWITH_LZ4="system"
+CMAKE_ARGS+=		-DWITH_SSL="system"
+CMAKE_ARGS+=		-DWITH_ZLIB="system"
+#CMAKE_ARGS+=		-DDEFAULT_CHARSET=${MYSQL_CHARSET}
+#CMAKE_ARGS+=		-DDEFAULT_COLLATION=${MYSQL_COLLATION}
+#CMAKE_ARGS+=		-DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET}
+
+# we need atomic builtins
+#.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
+#GNU_ARCH.i386=		i586
+#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
+CMAKE_ARGS.SunOS+=	-DHAVE_EPOLL=NO
+CMAKE_ARGS.SunOS+=	-DEVENT__HAVE_SYS_EPOLL_H=NO
+CMAKE_ARGS.SunOS+=	-DEVENT__HAVE_EPOLL=NO
+
+
+#CFLAGS.SunOS+=		-DHAVE_CURSES_H
+#CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
+
+#.include "../../mk/pthread.buildlink3.mk"
+
+#.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/mysqlrouter
+
+SUBST_CLASSES+=		scr
+SUBST_STAGE.scr=	pre-configure
+SUBST_FILES.scr=	scripts/mysqld_safe.sh
+SUBST_FILES.scr+=	support-files/mysql.server.sh
+SUBST_SED.scr=		-e "s,chown,${CHOWN},g"
+SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
+SUBST_SED.scr+=		-e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
+SUBST_MESSAGE.scr=	Fixing scripts.
+
+# Don't use the base system "libedit" under NetBSD because MySQL expects
+# an incompatible prototype for "rl_completion_entry_function".
+#.if ${OPSYS} == "NetBSD"
+#USE_BUILTIN.editline=	no
+#.endif
+
+.include "../../mk/readline.buildlink3.mk"
+.if ${READLINE_TYPE} == "readline"
+CMAKE_ARGS+=		-DWITH_READLINE="system"
+.else
+CMAKE_ARGS+=		-DWITH_EDITLINE="system"
+.endif
+
+CHECK_PORTABILITY_SKIP+=	packaging/deb-in/mysql-packagesource-server.config.in
+
+.include "../../mk/curses.buildlink3.mk"
+.include "../../archivers/lz4/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"

databases/mysql80-client/PLIST

@@ -0,0 +1,63 @@
+@comment $NetBSD$
+bin/mysql
+bin/mysql_client_test
+bin/mysql_config
+bin/mysql_config_editor
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlpump
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
+include/mysql/errmsg.h
+include/mysql/field_types.h
+include/mysql/my_command.h
+include/mysql/my_list.h
+include/mysql/mysql.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysql/udf_registration_types.h
+include/mysql/mysql_com.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+lib/libmysqlclient.a
+lib/libmysqlclient.so
+lib/libmysqlclient.so.21
+lib/libmysqlclient.so.21.0.16
+lib/pkgconfig/mysqlclient.pc
+man/man1/comp_err.1
+man/man1/ibd2sdi.1
+man/man1/innochecksum.1
+man/man1/lz4_decompress.1
+man/man1/my_print_defaults.1
+man/man1/myisam_ftdump.1
+man/man1/myisamchk.1
+man/man1/myisamlog.1
+man/man1/myisampack.1
+man/man1/mysql.1
+man/man1/mysql.server.1
+man/man1/mysql_config.1
+man/man1/mysql_config_editor.1
+man/man1/mysql_secure_installation.1
+man/man1/mysql_ssl_rsa_setup.1
+man/man1/mysql_tzinfo_to_sql.1
+man/man1/mysql_upgrade.1
+man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlcheck.1
+man/man1/mysqld_multi.1
+man/man1/mysqld_safe.1
+man/man1/mysqldump.1
+man/man1/mysqldumpslow.1
+man/man1/mysqlimport.1
+man/man1/mysqlman.1
+man/man1/mysqlpump.1
+man/man1/mysqlshow.1
+man/man1/mysqlslap.1
+man/man1/perror.1
+man/man1/zlib_decompress.1
+man/man8/mysqld.8

databases/mysql80-client/buildlink3.mk

@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.3 2019/02/05 20:19:55 adam Exp $
+
+BUILDLINK_TREE+=	mysql-client
+
+.if !defined(MYSQL_CLIENT_BUILDLINK3_MK)
+MYSQL_CLIENT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=8.0<8.1
+BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=8.0<8.1
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql80-client
+BUILDLINK_INCDIRS.mysql-client?=	include/mysql
+BUILDLINK_LIBDIRS.mysql-client?=	lib
+
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.endif # MYSQL_CLIENT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-mysql-client

databases/mysql80-client/distinfo

@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.28 2019/02/05 20:19:55 adam Exp $
+
+SHA1 (mysql-8.0.16.tar.gz) = 0282645e6167f658962277d870123f9c88a5519f
+RMD160 (mysql-8.0.16.tar.gz) = 2e0d3326331b74fec8ab3e147f330d2d4f75382e
+SHA512 (mysql-8.0.16.tar.gz) = a6936473bf3a64ead4e70dd9a126c857fdb305f231c1e3915719a170c4a82e115d433ff96cb35f55855a9bca9085c2b4a8a88d672cdeee78e5c3f423ac266565
+Size (mysql-8.0.16.tar.gz) = 146811037 bytes
+SHA1 (patch-CMakeLists.txt) = e94533a9b7d7b0c07b73811030762352249568b8
+SHA1 (patch-client_CMakeLists.txt) = 98a2739a2769f906db8b559a25f601cd99cd45ca
+SHA1 (patch-cmake_boost.cmake) = ab788a9a2fa89845a497d38fede8b7796977de27
+SHA1 (patch-include_CMakeLists.txt) = 71c9d658ad4ab3c6cc542aeaf2d2801da9e4168a
+SHA1 (patch-libmysql_CMakeLists.txt) = e79cf661e478d6634761da79196eeca43a6608d5
+SHA1 (patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake) = 6c53ee586f493b46631d4f9682f29457b4daaeae
+SHA1 (patch-router_CMakeLists.txt) = 38093f5d156f5d94da65c95b003b66b8913ffa12
+SHA1 (patch-scripts_CMakeLists.txt) = 48184c5b2c98a2ba724d0b29fdd2a3253cab4846
+SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc) = 10039638c4fff9347f53466118f94466ebf12e5c
+SHA1 (patch-storage_myisam_mi__dynrec.cc) = 18ba2c806cb4c1deebd5988e46a5d0b81cf7dcd4
+SHA1 (patch-storage_myisam_mi__extra.cc) = 55443b27ded1156a3dd60bb66101ff95833650f2
+SHA1 (patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh) = cf9b8b609bb75c9a92e2c90bb3194b6b5541a8cb

databases/mysql80-client/options.mk

@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.3 2019/02/05 20:19:55 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql80
+
+PKG_SUPPORTED_OPTIONS+=	dtrace memcached
+
+.include "../../mk/bsd.options.mk"
+
+# Enable DTrace support
+.if !empty(PKG_OPTIONS:Mdtrace)
+CMAKE_ARGS+=		-DENABLE_DTRACE=ON
+.else
+CMAKE_ARGS+=		-DENABLE_DTRACE=OFF
+.endif
+
+# 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

databases/mysql80-client/patches/patch-CMakeLists.txt

@@ -0,0 +1,21 @@
+$NetBSD$
+
+Split configuration between -client and -server.
+
+--- CMakeLists.txt.orig	2019-01-25 22:33:03.000000000 +0000
++++ CMakeLists.txt
+@@ -1040,12 +1040,10 @@ ADD_SUBDIRECTORY(utilities)
+ ADD_SUBDIRECTORY(share)
+ ADD_SUBDIRECTORY(libservices)
+
+-IF(UNIX)
++IF(WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(man)
+-ENDIF()
+-
+-IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(testclients)
++ELSE()
+   ADD_SUBDIRECTORY(sql)
+ ENDIF()
+