mariadb104: Only install client scripts with client and vice-versa

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mariadb104: Only install client scripts with client and vice-versa
From: nia <nia%netbsd.org@localhost>
Date: Thu, 29 Apr 2021 10:40:37 +0000
Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Apr 29 12:40:37 2021 +0200
Changeset:	c171d8c809c97d2f80ce0ed54c4ddfd3341db78c

Modified Files:
	mariadb104-client/Makefile
	mariadb104-client/PLIST
	mariadb104-client/distinfo
	mariadb104-client/patches/patch-CMakeLists.txt
	mariadb104-client/patches/patch-scripts_CMakeLists.txt
	mariadb104-server/Makefile
	mariadb104-server/PLIST

Log Message:
mariadb104: Only install client scripts with client and vice-versa

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c171d8c809c97d2f80ce0ed54c4ddfd3341db78c

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

diffstat:
 mariadb104-client/Makefile                         |  3 -
 mariadb104-client/PLIST                            | 10 ---
 mariadb104-client/distinfo                         |  4 +-
 mariadb104-client/patches/patch-CMakeLists.txt     |  7 +-
 .../patches/patch-scripts_CMakeLists.txt           | 83 ++++++++++------------
 mariadb104-server/Makefile                         |  3 +
 mariadb104-server/PLIST                            | 23 ++++++
 7 files changed, 70 insertions(+), 63 deletions(-)

diffs:
diff --git a/mariadb104-client/Makefile b/mariadb104-client/Makefile
index cb7474d9fd..6fc74d0ea4 100644
--- a/mariadb104-client/Makefile
+++ b/mariadb104-client/Makefile
@@ -11,7 +11,4 @@ CMAKE_ARGS+=	-DWITHOUT_SERVER=ON
 
 INSTALL_DIRS+=	client include libmariadb man scripts
 
-post-install:
-	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mariadb104-client/PLIST b/mariadb104-client/PLIST
index b985f16907..c0f374a2f8 100644
--- a/mariadb104-client/PLIST
+++ b/mariadb104-client/PLIST
@@ -16,7 +16,6 @@ bin/msql2mysql
 bin/mysql
 bin/mysql_config
 bin/mysql_find_rows
-bin/mysql_install_db
 bin/mysql_plugin
 bin/mysqlaccess
 bin/mysqladmin
@@ -311,12 +310,3 @@ man/man1/wsrep_sst_rsync.1
 man/man1/wsrep_sst_rsync_wan.1
 man/man8/mariadbd.8
 man/man8/mysqld.8
-share/mysql/fill_help_tables.sql
-share/mysql/maria_add_gis_sp.sql
-share/mysql/maria_add_gis_sp_bootstrap.sql
-share/mysql/mysql_performance_tables.sql
-share/mysql/mysql_system_tables.sql
-share/mysql/mysql_system_tables_data.sql
-share/mysql/mysql_test_data_timezone.sql
-share/mysql/mysql_test_db.sql
-share/mysql/mysql_to_mariadb.sql
diff --git a/mariadb104-client/distinfo b/mariadb104-client/distinfo
index 78b5304194..25f5400ddb 100644
--- a/mariadb104-client/distinfo
+++ b/mariadb104-client/distinfo
@@ -5,13 +5,13 @@ RMD160 (mariadb-10.4.18.tar.gz) = b60d4820bab723851510e873daef8dae42b120bd
 SHA512 (mariadb-10.4.18.tar.gz) = 085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12
 Size (mariadb-10.4.18.tar.gz) = 81733656 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 5d7ca07065d13435157bf063d93e744223bed12e
+SHA1 (patch-CMakeLists.txt) = 9d11b3d80b4b32558cd284de060975791708f0fc
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_ConnectorName.cmake) = 57f891c4bd035afb4aa0b03c269ce859456e9f46
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
-SHA1 (patch-scripts_CMakeLists.txt) = 69d7adc8d50a23aeda4b9d9809cf64f6293703e0
+SHA1 (patch-scripts_CMakeLists.txt) = d0c0ac4d3b1b14d9fd1c72c5fad8a3985de19a8f
 SHA1 (patch-scripts_mysql__install__db.sh) = adf20e80a9881db97f3d2dd8279e52bcedf0bead
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f
diff --git a/mariadb104-client/patches/patch-CMakeLists.txt b/mariadb104-client/patches/patch-CMakeLists.txt
index 8cd5e717f8..62a573db47 100644
--- a/mariadb104-client/patches/patch-CMakeLists.txt
+++ b/mariadb104-client/patches/patch-CMakeLists.txt
@@ -13,7 +13,7 @@ Allow building a server-only configuration.
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
  
-@@ -416,19 +414,27 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -416,19 +414,26 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -38,13 +38,12 @@ Allow building a server-only configuration.
 +  ADD_SUBDIRECTORY(include)
 +  ADD_SUBDIRECTORY(client)
 +  ADD_SUBDIRECTORY(man)
-+  ADD_SUBDIRECTORY(scripts)
    ADD_SUBDIRECTORY(tests)
 +ELSE()
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
-@@ -446,21 +452,14 @@ IF(NOT WITHOUT_SERVER)
+@@ -446,21 +451,15 @@ IF(NOT WITHOUT_SERVER)
    ENDIF()
  ENDIF()
  
@@ -55,7 +54,7 @@ Allow building a server-only configuration.
 -INCLUDE(cmake/abi_check.cmake)
 -INCLUDE(cmake/tags.cmake)
 -INCLUDE(for_clients)
--ADD_SUBDIRECTORY(scripts)
+ ADD_SUBDIRECTORY(scripts)
 -ADD_SUBDIRECTORY(support-files)
  ADD_SUBDIRECTORY(extra/aws_sdk)
  
diff --git a/mariadb104-client/patches/patch-scripts_CMakeLists.txt b/mariadb104-client/patches/patch-scripts_CMakeLists.txt
index ed2822a4fb..e3c9fe53d8 100644
--- a/mariadb104-client/patches/patch-scripts_CMakeLists.txt
+++ b/mariadb104-client/patches/patch-scripts_CMakeLists.txt
@@ -1,30 +1,18 @@
 $NetBSD$
 
-Install missing scripts.
-
-We install all scripts with the client, for Reasons.
+Only install client scripts with the client.
 
 --- scripts/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
 +++ scripts/CMakeLists.txt
-@@ -91,7 +91,7 @@ SET(ADD_GIS_SP_EOL ";")
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
-   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
- 
--IF (NOT WITHOUT_SERVER)
-+IF (TRUE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -103,7 +103,7 @@ INSTALL(FILES 
-   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
-   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
-   ${FIX_PRIVILEGES_SQL}
--  DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
-+  DESTINATION ${INSTALL_MYSQLSHAREDIR}
- )
- ENDIF()
+@@ -195,15 +195,15 @@ SET(mysqld_locations "$basedir/${INSTALL
+ SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
+ SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
  
-@@ -202,10 +202,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+-IF(UNIX)
++IF(UNIX AND NOT WITHOUT_SERVER)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
+   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
+   EXECUTE_PROCESS(
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db
    )
  
@@ -33,28 +21,35 @@ We install all scripts with the client, for Reasons.
 +INSTALL(
 +  FILES "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db"
    DESTINATION ${INSTALL_SCRIPTDIR}
--  COMPONENT Server
+   COMPONENT Server
    )
- ENDIF()
- 
-@@ -296,7 +295,6 @@ ELSE()
-     INSTALL(
-       FILES  ${wsrep_sst_rsync_wan}
-       DESTINATION ${INSTALL_BINDIR}
--      COMPONENT Server
+@@ -319,12 +319,8 @@ ELSE()
+       mysqld_safe
+       mysqldumpslow
      )
- 
-     FOREACH(file ${WSREP_SOURCE})
-@@ -308,11 +306,10 @@ ELSE()
-       INSTALL(FILES
-         ${CMAKE_CURRENT_BINARY_DIR}/${file}
-         DESTINATION ${INSTALL_BINDIR}
--        COMPONENT ${${file}_COMPONENT}
-        )
-     ENDFOREACH()
-   ENDIF()
--  IF (NOT WITHOUT_SERVER)
-+  IF (TRUE)
-     SET(SERVER_SCRIPTS
-       mysql_fix_extensions
-       mysqld_multi
+-  ENDIF()
+-  # Configure this one, for testing, but do not install it.
+-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
+-  # On Unix, most of the files end up in the bin directory
+-  SET(BIN_SCRIPTS
++  ELSE()
++    SET(CLIENT_SCRIPTS
+     msql2mysql
+     mysql_config
+     mysql_setpermission
+@@ -334,6 +330,14 @@ ELSE()
+     mysql_find_rows
+     mytop
+     mysqlhotcopy
++    )
++  ENDIF()
++  # Configure this one, for testing, but do not install it.
++  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
++    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
++  # On Unix, most of the files end up in the bin directory
++  SET(BIN_SCRIPTS
++    ${CLIENT_SCRIPTS}
+     ${SERVER_SCRIPTS}
+     ${WSREP_SCRIPTS}
+     ${SYSTEMD_SCRIPTS}
diff --git a/mariadb104-server/Makefile b/mariadb104-server/Makefile
index c1bab3c6a3..b6cfac12f2 100644
--- a/mariadb104-server/Makefile
+++ b/mariadb104-server/Makefile
@@ -50,6 +50,9 @@ BUILD_DEFS+=		MARIADB_DATADIR
 OWN_DIRS_PERMS+=	${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
 OWN_DIRS_PERMS+=	${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
 
+post-install:
+	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/mysql_install_db
+
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../wip/mariadb104-client/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/mariadb104-server/PLIST b/mariadb104-server/PLIST
index 2f11e67712..554c012aa9 100644
--- a/mariadb104-server/PLIST
+++ b/mariadb104-server/PLIST
@@ -7,9 +7,13 @@ bin/aria_read_log
 bin/innochecksum
 bin/mariabackup
 bin/mariadb-backup
+bin/mariadb-dumpslow
+bin/mariadb-fix-extensions
 bin/mariadb-ldb
 bin/mariadb-tzinfo-to-sql
 bin/mariadb-waitpid
+bin/mariadbd-multi
+bin/mariadbd-safe
 bin/mariadbd-safe-helper
 bin/mbstream
 bin/my_print_defaults
@@ -18,15 +22,25 @@ bin/myisamchk
 bin/myisamlog
 bin/myisampack
 bin/myrocks_hotbackup
+bin/mysql_fix_extensions
+bin/mysql_install_db
 bin/mysql_ldb
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
+bin/mysqld_multi
+bin/mysqld_safe
 bin/mysqld_safe_helper
+bin/mysqldumpslow
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 bin/sst_dump
+bin/wsrep_sst_common
+bin/wsrep_sst_mariabackup
+bin/wsrep_sst_mysqldump
+bin/wsrep_sst_rsync
+bin/wsrep_sst_rsync_wan
 include/mysql/server/private/authors.h
 include/mysql/server/private/backup.h
 include/mysql/server/private/bounded_queue.h
@@ -343,6 +357,7 @@ share/mysql/dutch/errmsg.sys
 share/mysql/english/errmsg.sys
 share/mysql/errmsg-utf8.txt
 share/mysql/estonian/errmsg.sys
+share/mysql/fill_help_tables.sql
 share/mysql/french/errmsg.sys
 share/mysql/german/errmsg.sys
 share/mysql/greek/errmsg.sys
@@ -352,6 +367,14 @@ share/mysql/install_spider.sql
 share/mysql/italian/errmsg.sys
 share/mysql/japanese/errmsg.sys
 share/mysql/korean/errmsg.sys
+share/mysql/maria_add_gis_sp.sql
+share/mysql/maria_add_gis_sp_bootstrap.sql
+share/mysql/mysql_performance_tables.sql
+share/mysql/mysql_system_tables.sql
+share/mysql/mysql_system_tables_data.sql
+share/mysql/mysql_test_data_timezone.sql
+share/mysql/mysql_test_db.sql
+share/mysql/mysql_to_mariadb.sql
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian/errmsg.sys
 share/mysql/polish/errmsg.sys
Prev by Date: mariadb104-server: remove obsolete DEINSTALL script
Next by Date: mariadb104-client: update default DATADIR
Previous by Thread: mariadb104-server: remove obsolete DEINSTALL script
Next by Thread: mariadb104-client: update default DATADIR
Indexes:
Home | Main Index | Thread Index | Old Index