Index: head/databases/mysql-connector-c++/Makefile =================================================================== --- head/databases/mysql-connector-c++/Makefile (revision 342490) +++ head/databases/mysql-connector-c++/Makefile (revision 342491) @@ -1,56 +1,55 @@ # Created by: gahr # $FreeBSD$ PORTNAME= mysql-connector-c++ PORTVERSION= 1.1.3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-C++ MAINTAINER= gahr@FreeBSD.org COMMENT= A MySQL database connector for C++ LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs USE_MYSQL= 51+ -USE_LDCONFIG= yes USES= cmake:outsource +USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} .if defined(MAINTAINER_MODE) CMAKE_ARGS+= -DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \ -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1 regression-test: build # These tests assume that a database is running on localhost, # with user:root and pass:root (cd ${WRKDIR}/.build ; \ test/CJUnitTestsPort/CJUnitTestsPort --verbose ; \ test/driver_test --verbose ; \ test/static_test --verbose ; \ examples/connect --verbose ; \ examples/connection_meta_schemaobj --verbose ; \ examples/debug --verbose ; \ examples/dynamic_load --verbose ; \ examples/exceptions --verbose ; \ examples/prepared_statement --verbose ; \ examples/resultset --verbose ; \ examples/resultset_binary --verbose ; \ examples/resultset_meta --verbose ; \ examples/resultset_types --verbose ; \ examples/statement --verbose ; \ test/unit/classes/art_resultset --verbose ; \ test/unit/classes/connection --verbose ; \ test/unit/classes/databasemetadata --verbose ; \ test/unit/classes/parametermetadata --verbose ; \ test/unit/classes/preparedstatement --verbose ; \ test/unit/classes/resultset --verbose ; \ test/unit/classes/resultsetmetadata --verbose ; \ test/unit/classes/savepoint --verbose ; \ test/unit/classes/statement ) .endif -NO_STAGE= yes .include Index: head/databases/mysql-connector-c++/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql-connector-c++/files/patch-CMakeLists.txt (revision 342490) +++ head/databases/mysql-connector-c++/files/patch-CMakeLists.txt (revision 342491) @@ -1,17 +1,39 @@ ---- CMakeLists.txt.orig 2012-08-09 10:44:22.000000000 +0200 -+++ CMakeLists.txt 2012-08-09 10:46:37.000000000 +0200 -@@ -252,14 +252,6 @@ - SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")") +--- CMakeLists.txt.orig 2013-03-25 10:45:20.000000000 +0100 ++++ CMakeLists.txt 2014-01-31 14:35:27.000000000 +0100 +@@ -38,7 +38,7 @@ + + if(COMMAND cmake_policy AND POLICY CMP0015) + cmake_policy(SET CMP0015 NEW) +-endif(COMMAND cmake_policy) ++endif(COMMAND cmake_policy AND POLICY CMP0015) + + #----------------- + # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment +@@ -221,7 +221,7 @@ + software free of charge under the GNU General Public License + (http://www.gnu.org/licenses/). You can also purchase commercial MySQL + licenses from ${CPACK_PACKAGE_VENDOR} if you do not wish to be +-bound by the terms of the GPL. See the chapter "Licensing and Support" ++bound by the terms of the GPL. See the chapter \"Licensing and Support\" + in the manual for further info.") + + IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") +@@ -249,17 +249,9 @@ + + IF(WIN32) + FILE(WRITE "${CMAKE_SOURCE_DIR}/win/config.cmake" "SET(CONNECTOR_PRODUCT_VERSION ${MYSQLCPPCONN_VERSION}) +-SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")") ++SET( LICENSE_FILENAME ${CPACK_RESOURCE_FILE_LICENSE})") ENDIF(WIN32) -INSTALL(FILES - ${CPACK_RESOURCE_FILE_README} - ${CPACK_RESOURCE_FILE_INSTALL} - ${CPACK_RESOURCE_FILE_LICENSE} - "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt" - "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" - DESTINATION "." OPTIONAL) - SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/" ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile" "install_manifest.txt")