Attachment #165161 for bug #205956

Lines 3-8 Link Here

(-)mysql57-client/Makefile (-1 / +4 lines)
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PKGNAMESUFFIX= 57-client	5	PKGNAMESUFFIX= 57-client
		6	PORTREVISION= 3
6		7
7	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)
8		9
Lines 14-20 PKGMESSAGE= ${.CURDIR}/pkg-message Link Here
14	PATCHDIR= ${.CURDIR}/files	15	PATCHDIR= ${.CURDIR}/files
15	PLIST= ${.CURDIR}/pkg-plist	16	PLIST= ${.CURDIR}/pkg-plist
16		17
17	CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*	18	CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \
		19	mariadb-client- \
		20	percona-client-
18		21
19	CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \	22	CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
20	-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \	23	-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \

Lines 8-18 Link Here

(-)mysql57-client/files/patch-include_CMakeLists.txt (-8 lines)
8	my_dbug.h	8	my_dbug.h
9	m_string.h	9	m_string.h
10	my_sys.h	10	my_sys.h
11	@@ -68,7 +69,6 @@ SET(HEADERS
12	${HEADERS_GEN_CONFIGURE}
13	)
14
15	-INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
16	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
17	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
18	PATTERN "*.h"

Lines 10-15 bin/mysqlimport Link Here

(-)mysql57-client/pkg-plist (+1 lines)
10	bin/mysqlpump	10	bin/mysqlpump
11	bin/mysqlshow	11	bin/mysqlshow
12	bin/mysqlslap	12	bin/mysqlslap
		13	include/mysql/binary_log_types.h
13	include/mysql/big_endian.h	14	include/mysql/big_endian.h
14	include/mysql/byte_order_generic.h	15	include/mysql/byte_order_generic.h
15	include/mysql/byte_order_generic_x86.h	16	include/mysql/byte_order_generic_x86.h

Lines 3-9 Link Here

(-)mysql57-server/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.10	5	PORTVERSION= 5.7.10
6	PORTREVISION= 1	6	PORTREVISION?= 2
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost	8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
9	PKGNAMESUFFIX?= 57-server	9	PKGNAMESUFFIX?= 57-server
Lines 119-125 OPENSSL_CMAKE_ON= -DWITH_SSL=yes Link Here
119	USE_CLANG= 3.3+	119	USE_CLANG= 3.3+
120		120
121	post-extract:	121	post-extract:
122	${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h	122	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
123		123
124	post-patch:	124	post-patch:
125	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt	125	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt

Lines 19-25 bin/replace Link Here

(-)mysql57-server/pkg-plist (-1 lines)
19	bin/resolve_stack_dump	19	bin/resolve_stack_dump
20	bin/resolveip	20	bin/resolveip
21	bin/zlib_decompress	21	bin/zlib_decompress
22	include/mysql/binary_log_types.h
23	lib/mysql/libmysqld.a	22	lib/mysql/libmysqld.a
24	lib/mysql/plugin/adt_null.so	23	lib/mysql/plugin/adt_null.so
25	lib/mysql/plugin/auth.so	24	lib/mysql/plugin/auth.so

Return to bug 205956