Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Feb 2016 12:00:14 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408481 - in head/databases/mysql-connector-c++: . files
Message-ID:  <201602081200.u18C0EiV072262@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Feb  8 12:00:14 2016
New Revision: 408481
URL: https://svnweb.freebsd.org/changeset/ports/408481

Log:
  - Fix documentation installation
  - Clarify LICENSE
  - Add LICENSE_FILE

Added:
  head/databases/mysql-connector-c++/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/databases/mysql-connector-c++/Makefile

Modified: head/databases/mysql-connector-c++/Makefile
==============================================================================
--- head/databases/mysql-connector-c++/Makefile	Mon Feb  8 11:36:31 2016	(r408480)
+++ head/databases/mysql-connector-c++/Makefile	Mon Feb  8 12:00:14 2016	(r408481)
@@ -3,21 +3,31 @@
 
 PORTNAME=	mysql-connector-c++
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C++
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL database connector for C++
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # only
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
 USE_MYSQL=	51+
 USES=		cmake:outsource
 USE_LDCONFIG=	yes
+CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}"
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+PORTDOCS=	*
+OPTIONS_DEFINE=	DOCS
+
+post-install:
+	@${RM} -f ${STAGEDIR}${DOCSDIR}/INSTALL \
+		${STAGEDIR}${DOCSDIR}/COPYING
 
 .if defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \

Added: head/databases/mysql-connector-c++/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql-connector-c++/files/patch-CMakeLists.txt	Mon Feb  8 12:00:14 2016	(r408481)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2016-01-12 18:42:38 UTC
++++ CMakeLists.txt
+@@ -316,7 +316,6 @@ ELSE(WIN32)
+   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+ ENDIF(WIN32)
+ 
+-SET(DOC_DESTINATION ".")
+ IF(RPM_LAYOUT)
+   SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
+ ENDIF()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602081200.u18C0EiV072262>