Attachment 170456 Details for Bug 209618 – sync mysql 5.6 and 5.7 ports

[patch] sync mysql 5.6 and 5.7 ports

sync-mysql-ports.diff (text/plain), 7.25 KB, created by Markus Kohlmeyer on 2016-05-18 18:57:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-05-18 18:57:37 UTC

Size: 7.25 KB

patch

obsolete

>diff -Naur databases/mysql56-client/Makefile databases/mysql56-client/Makefile
>--- databases/mysql56-client/Makefile	2016-05-18 15:50:04.580547000 +0200
>+++ databases/mysql56-client/Makefile	2016-05-18 16:02:06.299793000 +0200
>@@ -2,10 +2,13 @@
> # $FreeBSD: head/databases/mysql56-client/Makefile 394288 2015-08-15 08:18:31Z ale $
> 
> PORTNAME=	mysql
>+PORTREVISION?=	1
> PKGNAMESUFFIX=	56-client
> 
> COMMENT=	Multithreaded SQL database (client)
> 
>+LICENSE+=	LGPL21
>+
> MASTERDIR=	${.CURDIR}/../mysql56-server
> 
> PKGMESSAGE=	${.CURDIR}/pkg-message
>@@ -13,12 +16,13 @@
> PLIST=		${.CURDIR}/pkg-plist
> 
> CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
>-			mariadb*-client-* \
>-			percona*-client-*
>+			mysql[0-46-9][0-9]-client-* \
>+			mariadb[0-9][0-9]-client-* \
>+			percona[0-9][0-9]-client-*
> 
> CMAKE_ARGS+=	-DWITHOUT_SERVER=1
> 
>-USE_LDCONFIG=	${PREFIX}/lib/mysql
>+USE_LDCONFIG+=	${PREFIX}/lib/mysql
> 
> MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
> 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
>diff -Naur databases/mysql56-server/Makefile databases/mysql56-server/Makefile
>--- databases/mysql56-server/Makefile	2016-05-18 15:50:04.364429000 +0200
>+++ databases/mysql56-server/Makefile	2016-05-18 19:50:17.242668000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.6.30
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.6
> PKGNAMESUFFIX?=	56-server
>@@ -14,25 +14,43 @@
> BROKEN_powerpc64=	Does not build
> 
> SLAVEDIRS=	databases/mysql56-client
>-USES=		cmake shebangfix
>+USES=		bison:build cmake compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
> 
>-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
>+USE_OPENSSL=	yes
>+USE_PERL5=	run
>+
>+MY_DBDIR=	/var/db/mysql
>+MY_SECDIR=	/var/db/mysql_secure
>+MY_TMPDIR=	/var/db/mysql_tmpdir
>+
>+LIB_DEPENDS+=	libevent.so:devel/libevent2
>+
>+CMAKE_BUILD_TYPE=	Release
>+
>+CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
>+		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
>+		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
>+		-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
> 		-DINSTALL_INFODIR="info" \
> 		-DINSTALL_LIBDIR="lib/mysql" \
> 		-DINSTALL_MANDIR="man" \
>-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
>+		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
> 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
> 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
> 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
> 		-DINSTALL_SBINDIR="libexec" \
> 		-DINSTALL_SCRIPTDIR="bin" \
>+		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SQLBENCHDIR="share/mysql" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
> 		-DWITH_EDITLINE=system \
>-		-DWITH_LIBWRAP=1
>+		-DWITH_LIBEVENT=system \
>+		-DWITH_ZLIB=system
>+
>+DATADIR=	${PREFIX}/share/mysql
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
>@@ -40,17 +58,24 @@
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
>+SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
>+		MY_SECDIR=${MY_SECDIR} \
>+		MY_TMPDIR=${MY_TMPDIR}
>+
>+PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
>+		MY_SECDIR=${MY_SECDIR} \
>+		MY_TMPDIR=${MY_TMPDIR}
>+
> # MySQL-Server part
> .if !defined(CLIENT_ONLY)
>-USE_MYSQL=	yes
>-WANT_MYSQL_VER=	56
>+USES+=		mysql:56
> 
>-USES+=		perl5
>-USE_PERL5=	run
>+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
> 
> CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
>-			mariadb*-server-* \
>-			percona*-server-*
>+			mysql[0-46-9][0-9]-server-* \
>+			mariadb[0-9][0-9]-server-* \
>+			percona[0-9][0-9]-server-*
> 
> USE_RC_SUBR=	mysql-server
> 
>@@ -65,17 +90,35 @@
> 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
> 
> CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
>-.else
>-USES+=		libedit
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>-
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "armv6"
> EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
> .endif
> 
>+### Just for the sake of FreeBSD 9.X ###
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
>+WITH_OPENSSL_PORT=	yes
>+
>+### FreeBSD Version > 9.X ###
>+.else
>+.if defined(WITH_OPENSSL_BASE)
>+CMAKE_ARGS+=		-DWITH_SSL=system
>+.else
>+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
>+.endif
>+.endif
>+
>+post-patch:
>+	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
>+
>+.if !defined(CLIENT_ONLY)
>+post-stage:
>+	${MKDIR} ${STAGEDIR}${MY_DBDIR}
>+	${MKDIR} ${STAGEDIR}${MY_SECDIR}
>+	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
>+.endif
>+
> .include <bsd.port.post.mk>
>diff -Naur databases/mysql56-server/pkg-plist databases/mysql56-server/pkg-plist
>--- databases/mysql56-server/pkg-plist	2016-05-18 15:50:04.365511000 +0200
>+++ databases/mysql56-server/pkg-plist	2016-05-18 17:49:17.038353000 +0200
>@@ -129,3 +129,6 @@
> %%DATADIR%%/spanish/errmsg.sys
> %%DATADIR%%/swedish/errmsg.sys
> %%DATADIR%%/ukrainian/errmsg.sys
>+@dir(mysql,mysql,0755) %%MY_DBDIR%%
>+@dir(mysql,mysql,0750) %%MY_SECDIR%%
>+@dir(mysql,mysql,0750) %%MY_TMPDIR%%
>diff -Naur databases/mysql57-client/Makefile databases/mysql57-client/Makefile
>--- databases/mysql57-client/Makefile	2016-05-18 15:50:02.457037000 +0200
>+++ databases/mysql57-client/Makefile	2016-05-18 16:02:16.019761000 +0200
>@@ -9,8 +9,6 @@
> 
> LICENSE+=	LGPL21
> 
>-BROKEN_powerpc64=	Does not build
>-
> MASTERDIR=	${.CURDIR}/../mysql57-server
> 
> PKGMESSAGE=	${.CURDIR}/pkg-message
>diff -Naur databases/mysql57-server/Makefile databases/mysql57-server/Makefile
>--- databases/mysql57-server/Makefile	2016-05-18 15:50:02.419015000 +0200
>+++ databases/mysql57-server/Makefile	2016-05-18 20:37:39.027312000 +0200
>@@ -17,7 +17,7 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> SLAVEDIRS=	databases/mysql57-client
>-USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
>+USES=		bison:build cmake compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix
> 
> USE_OPENSSL=	yes
> USE_PERL5=	run
>@@ -58,6 +58,8 @@
> 		-DWITH_LZ4=system \
> 		-DWITH_ZLIB=system
> 
>+DATADIR=	${PREFIX}/share/mysql
>+
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
> .ifdef USE_MYSQL
>@@ -76,6 +78,8 @@
> .if !defined(CLIENT_ONLY)
> USES+=		mysql:57
> 
>+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
>+
> CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
> 			mysql[0-46-9][0-9]-server-* \
> 			mariadb[0-9][0-9]-server-* \
>@@ -88,8 +92,6 @@
> USERS=		mysql
> GROUPS=		mysql
> 
>-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
>-
> MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
> 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
> 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
>@@ -160,6 +162,7 @@
> 
> post-stage:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
>+	${MKDIR} ${STAGEDIR}${MY_DBDIR}
> 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
> 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
> .endif
>diff -Naur databases/mysql57-server/pkg-plist databases/mysql57-server/pkg-plist
>--- databases/mysql57-server/pkg-plist	2016-05-18 15:50:02.419570000 +0200
>+++ databases/mysql57-server/pkg-plist	2016-05-18 17:49:41.320891000 +0200
>@@ -155,5 +155,6 @@
> %%DATADIR%%/uninstall_rewriter.sql
> @sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
> @dir(mysql,mysql,0750) %%ETCDIR%%/keyring
>+@dir(mysql,mysql,0755) %%MY_DBDIR%%
> @dir(mysql,mysql,0750) %%MY_SECDIR%%
> @dir(mysql,mysql,0750) %%MY_TMPDIR%%
>

Flags:

rootservice: maintainer-approval? (ports-bugs)

Actions: View | Diff

Attachments on bug 209618: 170456