aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2015-09-23 10:30:42 +0800
committervanilla <vanilla@FreeBSD.org>2015-09-23 10:30:42 +0800
commit0af1a6fe035772a8404c95ef59b7cfe2b916f19e (patch)
treec2e6fb9f8c3bff92930fc19275e611ac37b705b7
parent5f07ea18f4238d06e19aadf3a9240d2b37d19c2c (diff)
downloadfreebsd-ports-gnome-0af1a6fe035772a8404c95ef59b7cfe2b916f19e.tar.gz
freebsd-ports-gnome-0af1a6fe035772a8404c95ef59b7cfe2b916f19e.tar.zst
freebsd-ports-gnome-0af1a6fe035772a8404c95ef59b7cfe2b916f19e.zip
Upgrade to 1.1.6.
-rw-r--r--databases/mysql-connector-c++/Makefile2
-rw-r--r--databases/mysql-connector-c++/distinfo4
-rw-r--r--databases/mysql-connector-c++/files/patch-CMakeLists.txt18
-rw-r--r--databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt15
4 files changed, 12 insertions, 27 deletions
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 7946aeedbeb3..f074d9d44af0 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql-connector-c++
-PORTVERSION= 1.1.5
+PORTVERSION= 1.1.6
CATEGORIES= databases
MASTER_SITES= MYSQL/Connector-C++
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index be857a065b9e..de8d28b9ec5f 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-connector-c++-1.1.5.tar.gz) = f3696726da29d56e0daad7046b30aa51444360a3ff112c079eb942929eb1cce8
-SIZE (mysql-connector-c++-1.1.5.tar.gz) = 519440
+SHA256 (mysql-connector-c++-1.1.6.tar.gz) = ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447
+SIZE (mysql-connector-c++-1.1.6.tar.gz) = 522236
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
index f726a75a5d27..7c36e8acfea5 100644
--- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- 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)
+--- CMakeLists.txt.orig 2015-06-04 12:58:30 UTC
++++ CMakeLists.txt
+@@ -305,14 +305,6 @@ IF(RPM_LAYOUT)
+ SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
+ ENDIF()
-INSTALL(FILES
- ${CPACK_RESOURCE_FILE_README}
@@ -10,8 +10,8 @@
- ${CPACK_RESOURCE_FILE_LICENSE}
- "${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
- "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
-- DESTINATION "." OPTIONAL)
+- DESTINATION ${DOC_DESTINATION} OPTIONAL)
-
- SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
- "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
- "install_manifest.txt")
+ SET(COMMON_IGNORE_FILES
+ "/CMakeFiles/"
+ "/Testing/"
diff --git a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt b/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
deleted file mode 100644
index 3d5a1d333bae..000000000000
--- a/databases/mysql-connector-c++/files/patch-cppconn_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
-- config.h
- connection.h
- datatype.h
- driver.h
-@@ -73,3 +72,4 @@
- warning.h)
-
- INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/cppconn)