svn commit: r415353 - in head/databases/mysql-connector-odbc: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon May 16 18:34:13 UTC 2016
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 at 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/)
More information about the svn-ports-head
mailing list