diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-01-18 17:54:32 +0800 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-01-18 17:54:32 +0800 |
| commit | 7c1b4c78c15b4c261d420d22acae9fee76c6efd1 (patch) | |
| tree | 18e7ef9fa2324e7ebe02404cb49f99451f316363 /databases | |
| parent | e71f7328568b901338a0a790bc0b91e24d4f918e (diff) | |
| download | freebsd-ports-gnome-7c1b4c78c15b4c261d420d22acae9fee76c6efd1.tar.gz freebsd-ports-gnome-7c1b4c78c15b4c261d420d22acae9fee76c6efd1.tar.zst freebsd-ports-gnome-7c1b4c78c15b4c261d420d22acae9fee76c6efd1.zip | |
databases/mariadb102-client: Fix build of dependent ports
- Move headers to -client port
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb102-client/Makefile | 13 | ||||
| -rw-r--r-- | databases/mariadb102-client/pkg-plist | 4 | ||||
| -rw-r--r-- | databases/mariadb102-server/Makefile | 1 | ||||
| -rw-r--r-- | databases/mariadb102-server/pkg-plist | 6 |
4 files changed, 11 insertions, 13 deletions
diff --git a/databases/mariadb102-client/Makefile b/databases/mariadb102-client/Makefile index 378ab9ba4b65..40a7b838199d 100644 --- a/databases/mariadb102-client/Makefile +++ b/databases/mariadb102-client/Makefile @@ -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 diff --git a/databases/mariadb102-client/pkg-plist b/databases/mariadb102-client/pkg-plist index ab60980ea118..ac4b62c16172 100644 --- a/databases/mariadb102-client/pkg-plist +++ b/databases/mariadb102-client/pkg-plist @@ -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 diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile index 40214a5ba784..580a0c8252ae 100644 --- a/databases/mariadb102-server/Makefile +++ b/databases/mariadb102-server/Makefile @@ -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) diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist index 20d45bb318b8..7a04eb944758 100644 --- a/databases/mariadb102-server/pkg-plist +++ b/databases/mariadb102-server/pkg-plist @@ -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 |