Attachment 241827 Details for Bug 270289 – [patch] Resolve libprotobuf issues

[patch] [patch] Resolve libprotobuf issues

databases_mysql80-20230428.diff (text/plain), 2.25 KB, created by Toshimichi Masubuchi on 2023-04-28 15:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshimichi Masubuchi

Created: 2023-04-28 15:47:04 UTC

Size: 2.25 KB

patch

obsolete

>diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
>index 0e2bf0f3d6..f11a0fe23d 100644
>--- a/databases/mysql80-client/Makefile
>+++ b/databases/mysql80-client/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	mysql
>-PORTREVISION=	1
>+PORTREVISION=	2
> PKGNAMESUFFIX=	80-client
> 
> COMMENT=	Multithreaded SQL database (client)
>diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
>index 8f2791aeda..876d9757d1 100644
>--- a/databases/mysql80-server/Makefile
>+++ b/databases/mysql80-server/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME?=		mysql
> PORTVERSION=		8.0.32
>-PORTREVISION?=		2
>+PORTREVISION?=		3
> CATEGORIES=		databases
> MASTER_SITES=		MYSQL/MySQL-8.0
> PKGNAMESUFFIX?=		80-server
>@@ -32,7 +32,6 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
> 		libicutu.so:devel/icu \
> 		liblz4.so:archivers/liblz4 \
> 		libzstd.so:archivers/zstd \
>-		libprotobuf.so:devel/protobuf \
> 		libfido2.so:security/libfido2 \
> 		libhidapi.so:comms/hidapi \
> 		${LIB_DEPENDS_${ARCH}}
>@@ -66,6 +65,7 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
> 		-DINSTALL_INFODIR="${INFO_PATH}" \
> 		-DINSTALL_LIBDIR="lib/mysql" \
>+		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
> 		-DINSTALL_MANDIR="share/man" \
> 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
> 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
>diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
>index be1487f667..15aa026bbb 100644
>--- a/databases/mysql80-server/pkg-plist
>+++ b/databases/mysql80-server/pkg-plist
>@@ -175,8 +175,9 @@ lib/mysql/plugin/keyring_udf.so
> lib/mysql/plugin/test_udf_services.so
> lib/mysql/plugin/validate_password.so
> lib/mysql/plugin/version_token.so
>-@comment lib/private/libprotobuf-lite.so.3.19.4
>-@comment lib/private/libprotobuf.so.3.19.4
>+lib/mysql/private/libprotobuf-lite.so.3.19.4
>+lib/mysql/private/libprotobuf.so.3.19.4
>+lib/mysql/libprotobuf-lite.so.3.19.4
> libexec/mysqld
> share/man/man1/ibd2sdi.1.gz
> share/man/man1/innochecksum.1.gz
>@@ -196,7 +197,6 @@ share/man/man1/mysqldumpslow.1.gz
> share/man/man1/mysqlrouter_passwd.1.gz
> share/man/man1/mysqlrouter_plugin_info.1.gz
> share/man/man1/mysqlrouter.1.gz
>-lib/mysql/libprotobuf-lite.so.3.19.4
> share/man/man8/mysqld.8.gz
> %%DATADIR%%/bulgarian/errmsg.sys
> %%DATADIR%%/charsets/Index.xml

Actions: View | Diff

Attachments on bug 270289: 241827