Date: Thu, 18 Jan 2018 09:54:32 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459320 - in head/databases: mariadb102-client mariadb102-server Message-ID: <201801180954.w0I9sW7Q012673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Thu Jan 18 09:54:32 2018 New Revision: 459320 URL: https://svnweb.freebsd.org/changeset/ports/459320 Log: databases/mariadb102-client: Fix build of dependent ports - Move headers to -client port Modified: head/databases/mariadb102-client/Makefile head/databases/mariadb102-client/pkg-plist head/databases/mariadb102-server/Makefile head/databases/mariadb102-server/pkg-plist Modified: head/databases/mariadb102-client/Makefile ============================================================================== --- head/databases/mariadb102-client/Makefile Thu Jan 18 09:48:48 2018 (r459319) +++ head/databases/mariadb102-client/Makefile Thu Jan 18 09:54:32 2018 (r459320) @@ -27,13 +27,12 @@ post-configure: ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: - ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 - ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig -. for f in server my_global.h my_sys.h mysql_com.h mysql_version.h - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/${f} -. endfor - ${RM} -r ${STAGEDIR}${DATADIR}/policy - ${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam* + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \ + ${STAGEDIR}${PREFIX}/man/man1/aria* \ + ${STAGEDIR}${PREFIX}/man/man1/myisam* + ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \ + ${STAGEDIR}${DATADIR}/policy \ + ${STAGEDIR}${PREFIX}/include/mysql/server # Fix https://mariadb.atlassian.net/browse/MDEV-9388 @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config Modified: head/databases/mariadb102-client/pkg-plist ============================================================================== --- head/databases/mariadb102-client/pkg-plist Thu Jan 18 09:48:48 2018 (r459319) +++ head/databases/mariadb102-client/pkg-plist Thu Jan 18 09:54:32 2018 (r459320) @@ -22,7 +22,11 @@ include/mysql/mariadb_dyncol.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h include/mysql/my_config.h +include/mysql/my_global.h +include/mysql/my_sys.h include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_version.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Thu Jan 18 09:48:48 2018 (r459319) +++ head/databases/mariadb102-server/Makefile Thu Jan 18 09:54:32 2018 (r459320) @@ -187,6 +187,7 @@ post-install: ${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \ ${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \ ${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING + ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) Modified: head/databases/mariadb102-server/pkg-plist ============================================================================== --- head/databases/mariadb102-server/pkg-plist Thu Jan 18 09:48:48 2018 (r459319) +++ head/databases/mariadb102-server/pkg-plist Thu Jan 18 09:54:32 2018 (r459320) @@ -44,12 +44,6 @@ bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 -@comment include/mysql/my_config.h -include/mysql/my_global.h -include/mysql/my_sys.h -include/mysql/mysql_com.h -include/mysql/mysql_version.h -@comment include/mysql/mysqld_error.h include/mysql/server/private/embedded_priv.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801180954.w0I9sW7Q012673>