Date: Tue, 4 Feb 2014 09:28:12 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342491 - in head/databases/mysql-connector-c++: . files Message-ID: <201402040928.s149SC3l075821@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Feb 4 09:28:11 2014 New Revision: 342491 URL: http://svnweb.freebsd.org/changeset/ports/342491 QAT: https://qat.redports.org/buildarchive/r342491/ Log: - STAGE-clean Modified: head/databases/mysql-connector-c++/Makefile head/databases/mysql-connector-c++/files/patch-CMakeLists.txt Modified: head/databases/mysql-connector-c++/Makefile ============================================================================== --- head/databases/mysql-connector-c++/Makefile Tue Feb 4 09:27:42 2014 (r342490) +++ head/databases/mysql-connector-c++/Makefile Tue Feb 4 09:28:11 2014 (r342491) @@ -15,8 +15,8 @@ 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} @@ -52,5 +52,4 @@ regression-test: build test/unit/classes/statement ) .endif -NO_STAGE= yes .include <bsd.port.mk> Modified: head/databases/mysql-connector-c++/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql-connector-c++/files/patch-CMakeLists.txt Tue Feb 4 09:27:42 2014 (r342490) +++ head/databases/mysql-connector-c++/files/patch-CMakeLists.txt Tue Feb 4 09:28:11 2014 (r342491) @@ -1,7 +1,29 @@ ---- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402040928.s149SC3l075821>