diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-16 18:34:11 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-16 18:34:11 +0000 |
| commit | 8543186e9560d1b8cce8e0ba178a4df869941664 (patch) | |
| tree | eaf0337e28cf5583448882087a2bdd6d83a74d08 /databases/mysql-connector-odbc | |
| parent | 88c7fc27efc3fdf442e0f74eaa8421435ce7be03 (diff) | |
| download | ports-8543186e9560d1b8cce8e0ba178a4df869941664.tar.gz ports-8543186e9560d1b8cce8e0ba178a4df869941664.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=415353
Diffstat (limited to 'databases/mysql-connector-odbc')
| -rw-r--r-- | databases/mysql-connector-odbc/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql-connector-odbc/files/patch-CMakeLists.txt | 9 |
2 files changed, 12 insertions, 9 deletions
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile index 640ff72da6c3..17aa973891bd 100644 --- a/databases/mysql-connector-odbc/Makefile +++ b/databases/mysql-connector-odbc/Makefile @@ -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 \ diff --git a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt index 5f7231cfef14..980b069bf6dd 100644 --- a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt +++ b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt @@ -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/) |