View | Details | Raw Unified | Return to bug 234577 | Differences between
and this patch

Collapse All | Expand All

(-)mysql-connector-c++/Makefile (-40 / +23 lines)
Lines 2-64 Link Here
2
# $FreeBSD: head/databases/mysql-connector-c++/Makefile 488341 2018-12-25 20:25:39Z tcberner $
2
# $FreeBSD: head/databases/mysql-connector-c++/Makefile 488341 2018-12-25 20:25:39Z tcberner $
3
3
4
PORTNAME=	mysql-connector-c++
4
PORTNAME=	mysql-connector-c++
5
PORTVERSION=	1.1.9
5
PORTVERSION=	8.0.13
6
PORTREVISION=	7
6
PORTREVISION=	1
7
CATEGORIES=	databases
7
CATEGORIES=	databases
8
MASTER_SITES=	MYSQL/Connector-C++
8
MASTER_SITES=	MYSQL/Connector-C++
9
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
9
10
10
MAINTAINER=	bofh@FreeBSD.org
11
MAINTAINER=	bofh@FreeBSD.org
11
COMMENT=	MySQL database connector for C++
12
COMMENT=	MySQL database connector for C++
12
13
13
LICENSE=	GPLv2 # only
14
LICENSE=	GPLv2 # only
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
15
16
17
CMAKE_ARGS=	-DINSTALL_LIB_DIR=lib -DINSTALL_DOC_DIR="${DOCSDIR}" all
18
DOCS_CMAKE_ARGS=	build_docs
19
16
LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
20
LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
17
21
18
USES=		cmake compiler:c++11-lang mysql ssl
22
USES=		cmake:noninja compiler:c++11-lang mysql ssl
23
IGNORE_WITH_MYSQL=	55 55m 55p 56 56p 56w 57 57p 100m 101m 102m
19
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
20
CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON 
21
25
22
PLIST_SUB=	PORTVERSION=${PORTVERSION}
26
PLIST_SUB=	PORTVERSION=${PORTVERSION}
23
27
24
PORTDOCS=	*
28
PORTDOCS=	*
25
OPTIONS_DEFINE=	DOCS
29
OPTIONS_DEFINE=	DOCS JDBC
30
OPTIONS_SUB=	yes
26
31
27
post-install:
32
DOCS_DESC=	Build doxygen based documentation
28
	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
33
JDBC_DESC=	The legacy API based on JDBC4
29
		${STAGEDIR}${DOCSDIR}/COPYING
30
34
31
.if defined(MAINTAINER_MODE)
35
DOCS_CMAKE_ON=	-DWITH_DOC=ON
32
CMAKE_ARGS+=	-DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \
36
JDBC_CMAKE_ON=	-DWITH_JDBC=ON
33
		-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1
34
37
35
do-test:
38
DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
36
#	These tests assume that a database is running on localhost,
39
37
#	with user:root and pass:root
40
post-install:
38
	(cd ${WRKDIR}/.build ; \
41
	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
39
	test/CJUnitTestsPort/CJUnitTestsPort --verbose ; \
42
		${STAGEDIR}${DOCSDIR}/LICENSE.txt
40
	test/driver_test --verbose ; \
43
	${MKDIR} ${STAGEDIR}${DOCSDIR}
41
	test/static_test --verbose ; \
44
	cd ${BUILD_WRKSRC}/doc && \
42
	examples/connect --verbose ; \
45
	${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
43
	examples/connection_meta_schemaobj --verbose ; \
44
	examples/debug --verbose ; \
45
	examples/dynamic_load --verbose ; \
46
	examples/exceptions --verbose ; \
47
	examples/prepared_statement --verbose ; \
48
	examples/resultset --verbose ; \
49
	examples/resultset_binary --verbose ; \
50
	examples/resultset_meta --verbose ; \
51
	examples/resultset_types --verbose ; \
52
	examples/statement --verbose ; \
53
	test/unit/classes/art_resultset --verbose ; \
54
	test/unit/classes/connection --verbose ; \
55
	test/unit/classes/databasemetadata --verbose ; \
56
	test/unit/classes/parametermetadata --verbose ; \
57
	test/unit/classes/preparedstatement --verbose ; \
58
	test/unit/classes/resultset --verbose ; \
59
	test/unit/classes/resultsetmetadata --verbose ; \
60
	test/unit/classes/savepoint --verbose ; \
61
	test/unit/classes/statement )
62
.endif
63
46
64
.include <bsd.port.mk>
47
.include <bsd.port.mk>
(-)mysql-connector-c++/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1495260128
1
TIMESTAMP = 1546435133
2
SHA256 (mysql-connector-c++-1.1.9.tar.gz) = 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4
2
SHA256 (mysql-connector-c++-8.0.13-src.tar.gz) = 64be955ad2b87376ade555651b0b86c3ecc6000faf71485d1dff360dff83c90f
3
SIZE (mysql-connector-c++-1.1.9.tar.gz) = 508255
3
SIZE (mysql-connector-c++-8.0.13-src.tar.gz) = 2174609
(-)mysql-connector-c++/files/patch-CMakeLists.txt (-10 lines)
Lines 1-10 Link Here
1
--- CMakeLists.txt.orig	2016-01-12 18:42:38 UTC
2
+++ CMakeLists.txt
3
@@ -316,7 +316,6 @@ ELSE(WIN32)
4
   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
5
 ENDIF(WIN32)
6
 
7
-SET(DOC_DESTINATION ".")
8
 IF(RPM_LAYOUT)
9
   SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
10
 ENDIF()
(-)mysql-connector-c++/files/patch-docbuild.txt (+13 lines)
Line 0 Link Here
1
diff --git doc/CMakeLists.txt doc/CMakeLists.txt
2
index 6e34652c..7f119ed1 100644
3
--- doc/CMakeLists.txt
4
+++ doc/CMakeLists.txt
5
@@ -90,7 +90,7 @@ FILE(GLOB sources *.txt)
6
 LIST(APPEND sources doxygen.cfg.in)
7
 
8
 
9
-ADD_CUSTOM_TARGET(build_docs
10
+ADD_CUSTOM_TARGET(build_docs ALL
11
   COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
12
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
13
   COMMENT "Building project documentation"
(-)mysql-connector-c++/pkg-plist (-23 / +54 lines)
Lines 1-23 Link Here
1
include/cppconn/build_config.h
1
%%JDBC%%include/jdbc/cppconn/build_config.h
2
include/cppconn/config.h
2
%%JDBC%%include/jdbc/cppconn/config.h
3
include/cppconn/connection.h
3
%%JDBC%%include/jdbc/cppconn/connection.h
4
include/cppconn/datatype.h
4
%%JDBC%%include/jdbc/cppconn/datatype.h
5
include/cppconn/driver.h
5
%%JDBC%%include/jdbc/cppconn/driver.h
6
include/cppconn/exception.h
6
%%JDBC%%include/jdbc/cppconn/exception.h
7
include/cppconn/metadata.h
7
%%JDBC%%include/jdbc/cppconn/metadata.h
8
include/cppconn/parameter_metadata.h
8
%%JDBC%%include/jdbc/cppconn/parameter_metadata.h
9
include/cppconn/prepared_statement.h
9
%%JDBC%%include/jdbc/cppconn/prepared_statement.h
10
include/cppconn/resultset.h
10
%%JDBC%%include/jdbc/cppconn/resultset.h
11
include/cppconn/resultset_metadata.h
11
%%JDBC%%include/jdbc/cppconn/resultset_metadata.h
12
include/cppconn/statement.h
12
%%JDBC%%include/jdbc/cppconn/statement.h
13
include/cppconn/sqlstring.h
13
%%JDBC%%include/jdbc/cppconn/sqlstring.h
14
include/cppconn/variant.h
14
%%JDBC%%include/jdbc/cppconn/variant.h
15
include/cppconn/version_info.h
15
%%JDBC%%include/jdbc/cppconn/version_info.h
16
include/cppconn/warning.h
16
%%JDBC%%include/jdbc/cppconn/warning.h
17
include/mysql_connection.h
17
%%JDBC%%include/jdbc/mysql_connection.h
18
include/mysql_driver.h
18
%%JDBC%%include/jdbc/mysql_driver.h
19
include/mysql_error.h
19
%%JDBC%%include/jdbc/mysql_error.h
20
lib/libmysqlcppconn-static.a
20
include/mysqlx/common/api.h
21
lib/libmysqlcppconn.so
21
include/mysqlx/common/error.h
22
lib/libmysqlcppconn.so.7
22
include/mysqlx/common/value.h
23
lib/libmysqlcppconn.so.7.%%PORTVERSION%%
23
include/mysqlx/common/op_if.h
24
include/mysqlx/common/settings.h
25
include/mysqlx/common/util.h
26
include/mysqlx/devapi/row.h
27
include/mysqlx/devapi/common.h
28
include/mysqlx/devapi/result.h
29
include/mysqlx/devapi/collations.h
30
include/mysqlx/devapi/crud.h
31
include/mysqlx/devapi/detail/row.h
32
include/mysqlx/devapi/detail/session.h
33
include/mysqlx/devapi/detail/crud.h
34
include/mysqlx/devapi/detail/settings.h
35
include/mysqlx/devapi/detail/result.h
36
include/mysqlx/devapi/detail/error.h
37
include/mysqlx/devapi/mysql_collations.h
38
include/mysqlx/devapi/executable.h
39
include/mysqlx/devapi/document.h
40
include/mysqlx/devapi/settings.h
41
include/mysqlx/devapi/collection_crud.h
42
include/mysqlx/devapi/error.h
43
include/mysqlx/devapi/mysql_charsets.h
44
include/mysqlx/devapi/table_crud.h
45
include/mysqlx/xdevapi.h
46
include/mysqlx/xapi.h
47
include/mysqlx/common.h
48
include/mysqlx/common_constants.h
49
%%JDBC%%lib/libmysqlcppconn.so
50
%%JDBC%%lib/libmysqlcppconn.so.7
51
%%JDBC%%lib/libmysqlcppconn.so.7.%%PORTVERSION%%
52
lib/libmysqlcppconn8.so
53
lib/libmysqlcppconn8.so.1
54
lib/libmysqlcppconn8.so.1.%%PORTVERSION%%

Return to bug 234577