From owner-svn-ports-all@freebsd.org Mon May 16 18:34:13 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 311B7B3DCE0; Mon, 16 May 2016 18:34:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7FD319E7; Mon, 16 May 2016 18:34:12 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GIYCoJ090457; Mon, 16 May 2016 18:34:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GIYCj5090454; Mon, 16 May 2016 18:34:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201605161834.u4GIYCj5090454@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 16 May 2016 18:34:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415353 - in head/databases/mysql-connector-odbc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 18:34:13 -0000 Author: amdmi3 Date: Mon May 16 18:34:11 2016 New Revision: 415353 URL: https://svnweb.freebsd.org/changeset/ports/415353 Log: - Add LICENSE - Switch to USES=mysql - Don't install license with documentation - Mark MAKE_JOBS_UNSAFE, sporadic build failures with parallel build: CMake Error at cmake/generateinifiles.cmake:60 (CONFIGURE_FILE): configure_file Problem configuring file Modified: head/databases/mysql-connector-odbc/Makefile head/databases/mysql-connector-odbc/files/patch-CMakeLists.txt Modified: head/databases/mysql-connector-odbc/Makefile ============================================================================== --- head/databases/mysql-connector-odbc/Makefile Mon May 16 18:20:41 2016 (r415352) +++ head/databases/mysql-connector-odbc/Makefile Mon May 16 18:34:11 2016 (r415353) @@ -12,22 +12,26 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER} +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= unixODBC>=2.2.14_1:databases/unixODBC LIB_DEPENDS= libodbc.so:databases/unixODBC +USES= cmake mysql +CMAKE_ARGS= -DWITH_UNIXODBC=1 USE_LDCONFIG= yes -USE_MYSQL= yes -USES= cmake + +MAKE_JOBS_UNSAFE=yes IGNORE_WITH_MYSQL= 55 55m 55p 51 51m 51p -CMAKE_ARGS= -DWITH_UNIXODBC=1 LDFLAGS+= -L${LOCALBASE}/lib DRIVER_MANAGER= unixodbc PORTDOCS= ChangeLog INSTALL \ - README README.debug COPYING Licenses_for_Third-Party_Components.txt + README README.debug Licenses_for_Third-Party_Components.txt PLIST_FILES= bin/myodbc-installer \ lib/libmyodbc5a.so \ Modified: head/databases/mysql-connector-odbc/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql-connector-odbc/files/patch-CMakeLists.txt Mon May 16 18:20:41 2016 (r415352) +++ head/databases/mysql-connector-odbc/files/patch-CMakeLists.txt Mon May 16 18:34:11 2016 (r415353) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2011-10-04 23:19:00.000000000 +0300 -+++ CMakeLists.txt 2011-10-15 11:36:44.000000000 +0300 -@@ -201,7 +201,7 @@ +--- CMakeLists.txt.orig 2014-06-18 22:50:16 UTC ++++ CMakeLists.txt +@@ -269,7 +269,7 @@ ENDIF(NOT DISABLE_GUI) ADD_SUBDIRECTORY(dltest) ADD_SUBDIRECTORY(installer) @@ -9,7 +9,7 @@ ############################################################################## # -@@ -281,18 +281,18 @@ +@@ -382,18 +382,17 @@ IF(WIN32) ELSE(WIN32) @@ -23,7 +23,6 @@ + INSTALL(FILES INSTALL DESTINATION ./share/doc/mysql-connector-odbc/) IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") - INSTALL(FILES COPYING DESTINATION .) -+ INSTALL(FILES COPYING DESTINATION ./share/doc/mysql-connector-odbc/) ELSE() - INSTALL(FILES LICENSE.mysql DESTINATION .) + INSTALL(FILES LICENSE.mysql DESTINATION ./share/doc/mysql-connector-odbc/)