From fb4fa1bce51575fe1b09d3a3c594c0d497fae483 Mon Sep 17 00:00:00 2001
From: gahr <gahr@FreeBSD.org>
Date: Tue, 29 Jul 2014 12:56:12 +0000
Subject: - Update to 1.1.4   Release notes:  
 http://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-4.html

---
 databases/mysql-connector-c++/Makefile             |  3 +-
 databases/mysql-connector-c++/distinfo             |  4 +--
 .../mysql-connector-c++/files/patch-CMakeLists.txt | 32 ++++------------------
 databases/mysql-connector-c++/pkg-plist            |  1 +
 4 files changed, 9 insertions(+), 31 deletions(-)

(limited to 'databases')

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index d36b79ff7bf0..b01fd0d9840c 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-c++
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-C++
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index 99b3581f830f..443f89d35494 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-c++-1.1.3.tar.gz) = 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690
-SIZE (mysql-connector-c++-1.1.3.tar.gz) = 496226
+SHA256 (mysql-connector-c++-1.1.4.tar.gz) = 70d2898715555473b27b433c7fd76242b4f8ac3209541b1d12518c255dac2e7e
+SIZE (mysql-connector-c++-1.1.4.tar.gz) = 506076
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
index 4990409a19aa..f726a75a5d27 100644
--- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
@@ -1,29 +1,7 @@
---- 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})")
+--- CMakeLists.txt.orig	2014-07-24 20:53:44.000000000 +0200
++++ CMakeLists.txt	2014-07-29 12:53:28.000000000 +0200
+@@ -261,14 +261,6 @@
+   SET(CPACK_GENERATOR "TGZ")
  ENDIF(WIN32)
  
 -INSTALL(FILES
@@ -35,5 +13,5 @@
 -	DESTINATION "." OPTIONAL)
 -
  SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
-     ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
+     "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
  	"install_manifest.txt")
diff --git a/databases/mysql-connector-c++/pkg-plist b/databases/mysql-connector-c++/pkg-plist
index 24407081a884..01c5b73724e3 100644
--- a/databases/mysql-connector-c++/pkg-plist
+++ b/databases/mysql-connector-c++/pkg-plist
@@ -14,6 +14,7 @@ include/cppconn/sqlstring.h
 include/cppconn/warning.h
 include/mysql_connection.h
 include/mysql_driver.h
+include/mysql_error.h
 lib/libmysqlcppconn-static.a
 lib/libmysqlcppconn.so
 lib/libmysqlcppconn.so.7.%%PORTVERSION%%
-- 
cgit