5 files changed, 21 insertions, 25 deletions

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 268dbc6f5020..37c154a87b3a 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql-connector-c++
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 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 38caa15a2086..2a9a285bc031 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-c++-1.1.0.tar.gz) = dfb8933dada706a1b3188b162fc5a9686b5ed46323bf09548ce291e8dd4545e2
-SIZE (mysql-connector-c++-1.1.0.tar.gz) = 467089
+SHA256 (mysql-connector-c++-1.1.1.tar.gz) = 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e
+SIZE (mysql-connector-c++-1.1.1.tar.gz) = 492659
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
index 635e357410b9..037d047e0aa0 100644
--- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
@@ -1,21 +1,17 @@
---- CMakeLists.txt.orig	2010-09-10 11:47:48.000000000 +0200
-+++ CMakeLists.txt	2011-11-21 16:42:10.000000000 +0100
-@@ -225,7 +225,6 @@
+--- 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}")")
  ENDIF(WIN32)
  
--INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
- 
+-INSTALL(FILES
+-	${CPACK_RESOURCE_FILE_README}
+-	${CPACK_RESOURCE_FILE_INSTALL}
+-	${CPACK_RESOURCE_FILE_LICENSE}
+-	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
+-	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
+-	DESTINATION "." OPTIONAL)
+-
  SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
      ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
-@@ -252,6 +252,10 @@
- ENDIF(WIN32)
- MESSAGE(STATUS "Installation path is: ${CMAKE_INSTALL_PREFIX}   (overwrite with -DCMAKE_INSTALL_PREFIX=/your/path)")
- 
-+# this is where generated config.h files are placed
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
-+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
- 
- ADD_SUBDIRECTORY(cppconn)
- ADD_SUBDIRECTORY(driver)
+ 	"install_manifest.txt")
diff --git a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
index 8bafe1851e38..3d5a1d333bae 100644
--- a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
@@ -1,6 +1,6 @@
---- cppconn/CMakeLists.txt.orig	2011-11-21 16:34:57.000000000 +0100
-+++ cppconn/CMakeLists.txt	2011-11-21 16:36:39.000000000 +0100
-@@ -55,7 +55,6 @@
+--- cppconn/CMakeLists.txt.orig	2012-08-09 10:30:25.000000000 +0200
++++ cppconn/CMakeLists.txt	2012-08-09 10:31:01.000000000 +0200
+@@ -58,7 +58,6 @@
  
  SET(MYSQLCPPCONN_INSTALL_HEADERS
  		build_config.h
@@ -8,7 +8,7 @@
  		connection.h
  		datatype.h
  		driver.h
-@@ -70,3 +69,4 @@
+@@ -73,3 +72,4 @@
  		warning.h)
  
  INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)
diff --git a/databases/mysql-connector-c++/pkg-plist b/databases/mysql-connector-c++/pkg-plist
index 288ad08a4011..a78b15093df3 100644
--- a/databases/mysql-connector-c++/pkg-plist
+++ b/databases/mysql-connector-c++/pkg-plist
@@ -16,6 +16,6 @@ include/mysql_connection.h
 include/mysql_driver.h
 lib/libmysqlcppconn-static.a
 lib/libmysqlcppconn.so
-lib/libmysqlcppconn.so.5.%%PORTVERSION%%
-lib/libmysqlcppconn.so.5
+lib/libmysqlcppconn.so.6.%%PORTVERSION%%
+lib/libmysqlcppconn.so.6
 @dirrm include/cppconn