diff options
author | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-27 15:06:54 +0000 |
---|---|---|
committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-27 15:06:54 +0000 |
commit | 3c90fd702b974ae9f74e608ff93671847f5de46c (patch) | |
tree | f7794d2362eca1b6bb489cee7a083d1aa771ab2d /databases/mariadb103-server | |
parent | 08952c24d330f696558320bd7a89ed3ae0ed3405 (diff) | |
download | ports-3c90fd702b974ae9f74e608ff93671847f5de46c.tar.gz ports-3c90fd702b974ae9f74e608ff93671847f5de46c.zip |
databases/mariadb103-server: Fix plist issues
- Resurect mysql_upgrade [1]
- Move some files between -client and -server
PR: 232735 [1]
Reported by: Naram Qashat <cyberbotx cyberbotx com> [1]
MFH: 2018Q4
Notes
Notes:
svn path=/head/; revision=483143
Diffstat (limited to 'databases/mariadb103-server')
-rw-r--r-- | databases/mariadb103-server/Makefile | 3 | ||||
-rw-r--r-- | databases/mariadb103-server/files/patch-MDEV-11790 | 46 | ||||
-rw-r--r-- | databases/mariadb103-server/pkg-plist | 36 |
3 files changed, 78 insertions, 7 deletions
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 9acd017e8d58..6ad3239472d1 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= mariadb PORTVERSION= 10.3.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -175,7 +175,6 @@ SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r ${STAGEDIR}${DATADIR}/charsets .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) diff --git a/databases/mariadb103-server/files/patch-MDEV-11790 b/databases/mariadb103-server/files/patch-MDEV-11790 new file mode 100644 index 000000000000..1794bcf44da7 --- /dev/null +++ b/databases/mariadb103-server/files/patch-MDEV-11790 @@ -0,0 +1,46 @@ +WITHOUT_SERVER installs server-only files + +https://jira.mariadb.org/browse/MDEV-11790 +--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC ++++ extra/CMakeLists.txt +@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() + +-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) ++MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) + TARGET_LINK_LIBRARIES(replace mysys) + + IF(UNIX) +--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC ++++ scripts/CMakeLists.txt +@@ -241,7 +241,10 @@ ENDIF() + SET(mysql_config_COMPONENT COMPONENT Development) + SET(msql2mysql_COMPONENT COMPONENT Client) + SET(mysqlaccess_COMPONENT COMPONENT Client) ++SET(mysqlhotcopy_COMPONENT COMPONENT Client) ++SET(mysql_convert_table_format_COMPONENT COMPONENT Client) + SET(mysql_find_rows_COMPONENT COMPONENT Client) ++SET(mysql_setpermission_COMPONENT COMPONENT Client) + SET(mytop_COMPONENT Mytop) + + IF(WIN32) +@@ -298,14 +301,14 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(BIN_SCRIPTS + msql2mysql +- mysql_config +- mysql_setpermission +- mysql_secure_installation + mysqlaccess ++ mysqlhotcopy ++ mysql_config + mysql_convert_table_format + mysql_find_rows ++ mysql_secure_installation ++ mysql_setpermission + mytop +- mysqlhotcopy + ${SERVER_SCRIPTS} + ${WSREP_SCRIPTS} + ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index c88781dc7cd2..18370efab042 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -25,8 +25,8 @@ bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation @comment bin/mysql_setpermission -@comment bin/mysql_tzinfo_to_sql -@comment bin/mysql_upgrade +bin/mysql_tzinfo_to_sql +bin/mysql_upgrade @comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe @@ -36,7 +36,7 @@ bin/mysqldumpslow @comment bin/mysqltest @comment bin/mysqltest_embedded @comment bin/mytop -@comment bin/perror +bin/perror @comment bin/replace bin/resolve_stack_dump bin/resolveip @@ -222,14 +222,14 @@ man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz -@comment man/man1/mysql_upgrade.1.gz +man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz -@comment man/man1/perror.1.gz +man/man1/perror.1.gz @comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz @@ -261,6 +261,32 @@ man/man8/mysqld.8.gz %%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys |