svn commit: r351928 - in branches/2014Q2/databases/mysql-connector-c: . files

[Pietro Cerutti]

Author: gahr
Date: Wed Apr 23 12:15:10 2014
New Revision: 351928
URL: http://svnweb.freebsd.org/changeset/ports/351928
QAT: https://qat.redports.org/buildarchive/r351928/

Log:
  MFH: r351376
  
  - Unbreak by depending on OpenSSL from ports
  - Bump PORTREVISION (dependencies changed)
  
  Reported by:	pkg-fallout
  Approved by:    portmgr

Added:
  branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt
     - copied unchanged from r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt
Modified:
  branches/2014Q2/databases/mysql-connector-c/Makefile
  branches/2014Q2/databases/mysql-connector-c/pkg-plist
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/databases/mysql-connector-c/Makefile
==============================================================================
--- branches/2014Q2/databases/mysql-connector-c/Makefile	Wed Apr 23 12:13:53 2014	(r351927)
+++ branches/2014Q2/databases/mysql-connector-c/Makefile	Wed Apr 23 12:15:10 2014	(r351928)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysql-connector-c
 PORTVERSION=	6.1.3
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	Connector-C
@@ -14,7 +15,13 @@ COMMENT=	MySQL database connector for C
 LICENSE=	GPLv2
 
 USE_MYSQL=	51+
+USE_OPENSSL=	yes
+WITH_OPENSSL_PORT=yes
 USES=		cmake:outsource
+CMAKE_ARGS+=	-DWITH_SSL=system \
+		-DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include \
+		-DOPENSSL_LIBRARY=${LOCALBASE}/lib/libssl.so \
+		-DCRYPTO_LIBRARY=${LOCALBASE}/lib/libcrypto.so
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}

Copied: branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt (from r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt	Wed Apr 23 12:15:10 2014	(r351928, copy of r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2014-01-31 15:10:13.000000000 +0100
++++ CMakeLists.txt	2014-01-31 15:10:39.000000000 +0100
+@@ -535,7 +535,7 @@
+ #
+ # RPM installs documentation directly from the source tree
+ #
+-IF(NOT INSTALL_LAYOUT MATCHES "RPM")
++IF(NOT INSTALL_LAYOUT MATCHES "RPM" AND 0)
+   INSTALL(FILES COPYING LICENSE.mysql 
+     DESTINATION ${INSTALL_DOCREADMEDIR} 
+     COMPONENT Readme

Modified: branches/2014Q2/databases/mysql-connector-c/pkg-plist
==============================================================================
--- branches/2014Q2/databases/mysql-connector-c/pkg-plist	Wed Apr 23 12:13:53 2014	(r351927)
+++ branches/2014Q2/databases/mysql-connector-c/pkg-plist	Wed Apr 23 12:15:10 2014	(r351928)
@@ -66,7 +66,6 @@ lib/mysql-connector-c/libmysqlclient.so.
 lib/mysql-connector-c/libmysqlclient_r.a
 lib/mysql-connector-c/libmysqlclient_r.so
 lib/mysql-connector-c/libmysqlclient_r.so.18
-libdata/ldconfig/mysql-connector-c
 @dirrm lib/mysql-connector-c
 @dirrm bin/mysql-connector-c
 @dirrm include/mysql-connector-c/mysql/psi